Fix duplicate line from bad rebase
Adding some required attributes to the peer assessment module
Merge pull request #46 from edx/sanchez/fix_default_peer_assessment

Adding some required attributes to the peer assessment module
Merge pull request #45 from edx/will/template-move-fixup

Fix duplicate line from bad rebase
Namespace templates to openassessmentblock
Merge pull request #47 from edx/will/namespace-templates

Namespace templates to openassessmentblock
Merge branch 'master' into sanchez/TIM-171-Submission-UI

Conflicts:
	apps/openassessment/xblock/peer_assessment_mixin.py
	apps/openassessment/xblock/submission_mixin.py