Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py

Feature/cale/pep8 autofix

Use timestamp in collection name for modulestore tests

Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.

Patch peer grading tab to work

Allow policy.json to disable progress graph

Revert "Fix permissions bug and add test cases for django comment client...

a model change as well)

This reverts commit 05354745.

This reverts commit e7450874.

Fix bug where we imported two functions w/ the same name

change from throwing a Http404 exception, which I believe will try to re...

undo pipeline changes

change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.

studio - resolved HTML display issue with bold and blockquote

Feature/vik/peer grading xmodule

the closure checking more robust