Fixed test_masquerade failure due to not clearing the modulestore
between tests.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py

Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups

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.

small change in aggregating peer eval grades (rounds up)

Jonahstanley/help acceptance test

set first FAQ link to mktg webiste too

Persist static_tab name.