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
Cleaned up styles around image submissions
Merge pull request #523 from edx/grady/image-submission-ux

Cleaned up styles around image submissions
adjusted the width of the step status to prevent wrapping on smaller screens
recompiled css
Merge pull request #531 from edx/frances/fix/step-status-layout

Prevent Step Status Wrap
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
Add file upload API to developer docs

Point setup instructions to the README

Add instructions for combining/minifying static assets

Update workflow overview architecture docs

Update AI grading architecture docs

Use napoleon keyword argument instead of kwargs

Fix example usage docstrings in AI API
Changed the Student Training Example Authoring Interface to correctly use "Point" vs "Points"
Merge pull request #541 from edx/will/update-dev-docs

Update developer docs