Issue #1905502 by tekante, hkirsman: Adjusted to ensure items supporting the context inline editor are only added to pages if the editor is enabled
Issue #1910432 by Simon Georges: Remove context.module from files[] in .info
Issue #1908934 by e2thex: replace jQuery with $ so that jQuery can be updated
Merge branch '7.x-3.x' of git.drupal.org:project/context into 7.x-3.x
Issue #1940616 by opi: Wrong comment for context_preprocess_page()
Addition of block token to ensure json block rendering is only available to those who can place blocks and make sure access denied check works
Addition of block token to ensure json block rendering is only available to those who can place blocks
Issue #1866148 by stijndm: Closing the inline editor results in a page not found on sites using path prefixes
Issue #1238580 by tekante, mukhsim: Context edit form does not assign block weights properly.
