Upgrading gunicorn to latest
Removed spacebar event handler, because it did more harm than good.
Improve debuggability when call-count numbers don't match up
Add test to verify bad query behavior of xblock_handler
Add memoization for has_changes
Pre-cache has_changes when computing ancestors
Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls

Hotfix - reduce number of Studio mongo calls
Merge branch 'release' into andya/merge-hotfix-2014-08-29

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
Merge branch 'release' into andya/merge-hotfix-2014-08-29

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29
change default settings for servers/assets paver tasks from "dev" to "devstack"
Update pavelib.rst and run_devstack.rst  for changes to default settings
Move edit info into xblock and runtime mixins
LMS-11183, LMS-11184
Handle the indexerror exception on create_order
LMS-2646
Implement edit info as mixin for split
LMS-11183, LMS-11184
Tweak mongo count numbers
Revert "AWS settings for XBlocks to have filesystem-like storage"
Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs

Revert "AWS settings for XBlocks to have filesystem-like storage"
Implement mediated bulk purchase epic

Updating EX-60 logic
Change published_date to published_on
to make consistent with other edit info timestamps
LMS-11184