Remove true/false, add green/red check
Remove true/false, add green/red check
Merge origin/master

Conflicts:
	app/scripts/controllers/subjects.js
Add activ queue
Merge origin/master