Add queueActive switch, global access var to test
Merge origin/master

Conflicts:
	app/scripts/controllers/subjects.js