xx
Merge branch 'master' of https://github.com/HCI-webdesigner/Dean

Conflicts:
	app/models/User.java