Restore user module changes, to be refactored
Fix typo
Merge branch 'develop'

Conflicts:
	usr/module/user/locale/zh-cn/admin.mo
	usr/module/user/locale/zh-cn/admin.po
	usr/module/user/src/Api/Form.php
	usr/module/user/src/Form/UserForm.php
Merge from develop