Merge branch 'feature/new-member'

Conflicts:
	app/models/User.java
	conf/routes
Someone committed 1.sql. Was it me?