work in progress on register user (tests needs to be done)
Merge remote-tracking branch 'origin/master' into feature/new-member

Conflicts:
	conf/routes
Updated dummy user data to fit Models.User
Merge branch 'feature/new-member'

Conflicts:
	app/models/User.java
	conf/routes