Fixing up add/edit users
Merge branch 'NewApp'

Conflicts:
	app/controllers/Register.java
	app/views/Application/register.html
	conf/routes
fix this one