Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py

Force instantiation of the user before querying

Remove director of engineering job posting per request from Tess

Feature/will/coderesponse lettuce tests

Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine

http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error

Reduce pep8 warnings.

world.css_click() helper instead of directly
calling splinter.

studio - added in basic JS confirm UI when deleting course updates

which should have been included in the last commit

lms/djangoapps/courseware/
Separated tests of the mock server into test_mock_xqueue_server.py

Fix randomness bug in cohort placement

Remove associate legal council posting, per request from Tess

Bug fix for Polls tool.

add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception

Have to explicitly specify safe option on mongo insert, remove, update b...

Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.

server is not created for cms tests.

and simulates an XQueue.

Allow backwards compatibility for forums pinning UI.

Feature/cale/fix metadata inheritance

Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data

Feature/will/courseware lettuce tests

Fix/cdodge/add 500 404 templates to studio

add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser

Fix version handling for combined open ended