Server-side modifications made for running R3
Merge branch 'master' of https://github.com/lefterav/Appraise

Conflicts:
	appraise/evaluation/views.py