get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore

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

Fix/brian/fix500v1

add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions.  Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad.  Also cleanups for pylint and pep8.

Converter cleanup.

An integrity error while creating an enrollment just means that our work...

An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947

Added support for superscripts in variables

Fix bug 294

when loaded by rake test_cms

I moved the test into lms/courseware/tests so they run correctly.

strings.

Added unit tests that verify the fix.

Fix/vik/peer image grading

Fix 500 errors for bug #289

Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes...

Make the django_comment_client return errors that can't be parsed as JSO...

if we parse an invalid location in the content store middleware, then re...

Display advertised date correctly if it is an ISO date

studio - corrected JQ selector for smoothscrolling in-page links

Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context

Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029

optimize the result-set that gets returned from Mongo on metadata inheri...

optimize the result-set that gets returned from Mongo on metadata inheritence. We just need the fields which are actually inheritable, so no need to return anything else as it gets filtered out during the computation

Use get_many and set_many to cut down on the number of metadata trees to...

Use get_many and set_many to cut down on the number of metadata trees to retrieve, and only retrieve them once per call to _load_items