admin new user adding view added
a row added
newuser view commited
admin users list
conflict fixed
Merge branch 'master' of https://github.com/argeset/set-locale