Merge branch 'master' into uidev
fixed bug about creating new user
Merge branch 'uidev'