Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py

fix (again) static_replace to work with static_asset_path

Remove js log_event (keep compatibility)

keep log_event for compatibility

Add docs for changes in #726

Fix failing grade label being editable but not saved.

Incorporate Anant's suggestions

Use calc's evaluator for staff answers in `Numercial` type

Sync up Reset Action Button Styling for Capa xmodules

address some pylint violations in the mixedmodulestore build report

Add doc strings and fix spaces

on import, when enumerating through the 'draft content', OSX environment...

Fix/cdodge/get items needs courseid

don't put the substitutions in quotes

on import, when enumerating through the 'draft content', OSX environments will have hidden binary encoded quarantine files. We don't want to try to process these as they will throw an exception when trying to be parsed. It's harmless - the import goes on fine - but it's a lot of clutter in the output logs.