Merge branch 'master' of https://github.com/DriesVandermeulen/almighty

Conflicts:
	app/controllers/subjects.server.controller.js
Merge branch 'master' of https://github.com/DriesVandermeulen/almighty