Move the rubric into its own template
Add feedback to JS server selfAssess()

Move overall feedback method from the peer assessment JS view to the rubric

Self assessment JS sends feedback to the server
Update self assessment XBlock handler
WIP: Self Criterion Feedback API change

Conflicts:
	openassessment/assessment/api/self.py
	openassessment/xblock/self_assessment_mixin.py
	openassessment/xblock/test/test_self.py
Changed some of models/base.py to reflect the increased complexity
Changed the template for rendering feedback to encorporate self feedback, and changed the handler to provide appropriate context
Addressed Code review comments (test cases + formatting)
Did not do refactor to minimize queries yet.
Added in changes to the grade xblock handler to show self assessed feedback
Merge branch 'master' of https://github.com/edx/edx-ora2 into will/grady/self-assessment-feedback

Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
Changed the way that Zero Option Criteria are found in order to reduce query counts.
Addressed code review comments
Merge pull request #532 from edx/will/grady/self-assessment-feedback

Will/grady/self assessment feedback