working on views/users/new and edit
Merge branch 'master' into anotherBranch
fix merge conflict
Merge pull request #52 from toannguyenle/anotherBranch

working on views/users/new and edit