Fix template path
Merge pull request #43 from edx/will/fix-template-path

Will/fix template path
Merge branch 'master' into sanchez/TIM-171-Submission-UI

Conflicts:
	apps/openassessment/xblock/submission_mixin.py
Updating templates based on merge from master.