Fixed variabled name in user module email templates
Merge pull request #1184 from taiwen/develop

Fixed variabled name in user module email templates
Formulate user reigster email strategy
Merge pull request #1185 from taiwen/develop

Formulate user reigster email strategy
Merge branch 'develop' into user-ux

Conflicts:
	usr/module/user/locale/en/admin.mo
	usr/module/user/locale/en/admin.po
	usr/module/user/locale/zh-cn/admin.mo
	usr/module/user/locale/zh-cn/admin.po