changes in edit and new user form
Merge branch 'development' of github.com:railskipl/meritize into development