Merge pull request #505 from edx/will/ora-661

Fix date format in template
Fixed the Rendering Order of Assessment Modules
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-668

Conflicts:
	openassessment/xblock/test/test_studio.py
Merge pull request #508 from edx/grady/ORA-668

Grady/Fix Assessment Rendering
Changed the default tab to be Prompt, not Settings
Merge pull request #514 from edx/grady/ORA-675

Changed the default tab to be Prompt, not Settings
WIP: Alert funcitonality for Rubric/Settings crossvalidation
First draft
Wiring in validation JS