Split XML serialization and validation contracts.
Merge pull request #409 from edx/sanchez/xml-validation-refactoring

Split XML serialization and validation contracts.
Added UI functionality to allow Three Tab OA Creation
Merge pull request #409 from edx/sanchez/xml-validation-refactoring

Split XML serialization and validation contracts.
Merge pull request #429 from edx/sanchez/include_prompt_flag

Sanchez/include prompt flag
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/authoring_front_end

Included as a seperate commit so that merge can be examined if broken.

Conflicts:
	AUTHORS
	apps/openassessment/xblock/static/js/openassessment.min.js
	apps/openassessment/xblock/studio_mixin.py
	openassessment/xblock/openassessmentblock.py
	openassessment/xblock/xml.py
Finished OA editing in three tabs
Merge pull request #413 from edx/grady/authoring_front_end

Changed studio editing of open assessment blocks to have three tabs and changed validation process to accommodate
A completed first draft of the authoring changes.
Nearing the end of code review and testing.
Merge pull request #445 from edx/grady/authoring/assessments-gui

GUI to allow editing of ORA problems
Merge remote-tracking branch 'master' into authoring

Merged in AI Grading changes

Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_edit.js
	openassessment/xblock/xml.py
Merge remote-tracking branch 'origin/master' into authoring
A first pass at the HTML.  I didn't remove the previous text box to allow me to still have all of the JS work properly, and the page render.  FRONT --> BACK Lets go!
Ready For Code Review.  Some things still remain to be done, but they are all stylistic Front end things:
- Styles
- Styles
- Styles
- Radio Button Inheritance on deletion
- Feedback prompt followthrough
- Comprehensive front end testing
Update error logging; remove failing tests
Remove unused debugger statements
Cleanup of JavaScript docstrings and semicolons
Sets to lists; remove errors for extraneous keys
Handle unicode correctly; fix test cases
Use .parent() instead of wrapping the HTML with <li>
Fix formatting of missing key error message
Remove extra key check
Fix feedback checkbox selector in JS
Fix rubric dict being stored in the rubric criteria list XBlock field error
Merge pull request #469 from edx/will/authoring/Rubric-GUI

Will/authoring/rubric gui
Update boto to 2.30.0
Attempting to make our expand collapse experience the same as studios.
Merge pull request #477 from edx/grady/unify-expand-collapse

Unified our expand collapse to be in line with Studio's