Added consistency to the user edit form
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Because I want it!
Merge pull request #93 from j3rn/develop

Added consistency to user edit page