Fixing injection.
Merge branch 'master' into fix-injection

Conflicts:
	app/assets/app/pages/assignment/leader/LeaderAssignmentCtrl.js
	app/assets/app/pages/assignment/student/StudentAssignmentCtrl.js