[gh-48] Merging from testing into staging

sites/all/modules/context/API.txt

sites/all/modules/context/LICENSE.txt

sites/all/modules/context/README.txt

sites/all/modules/context/context.api.php

sites/all/modules/context/context.core.inc

sites/all/modules/context/context.info

sites/all/modules/context/context.install

sites/all/modules/context/context.module

sites/all/modules/context/context.plugins.inc

sites/all/modules/context/context_layouts/README.txt

.../all/modules/context/context_layouts/context_layouts.info

...ll/modules/context/context_layouts/context_layouts.module

...ontext_layouts/plugins/context_layouts_reaction_block.css

...ontext_layouts/plugins/context_layouts_reaction_block.inc

...context_layouts/plugins/context_layouts_reaction_block.js

sites/all/modules/context/context_ui/README.txt

sites/all/modules/context/context_ui/context_ui.css

sites/all/modules/context/context_ui/context_ui.info

sites/all/modules/context/context_ui/context_ui.install

sites/all/modules/context/context_ui/context_ui.js