Edit user profile WIP
Make it possible to edit Profiles.
Merge branch 'master' into editProfile

Conflicts:
	app/models/User.java
Merge pull request #5 from anhapu/editProfile

Edit profile