merge
Merge branch 'master' of https://github.com/Scrumblet-Team/Scrumble

Conflicts:
	app/model/data.js
	test/test.userController.js