Fixed Brendan's mistakes
fdsjlf
Log in required
ds stores
Merge branch 'master' into front-end-develop

Conflicts:
	scaffold_report/static/scaffold_report/scaffold_report.js
	scaffold_report/templates/scaffold_report/report.html