Local changes
Merge branch 'master' of https://github.com/icompuiz/node-ttkd

Conflicts:
	app/scripts/controllers/students/create.js