Merge branch 'master' of https://github.com/shanghaishule/myhuai.git

Conflicts:
	src/weTall/app/Tpl/home/default/user/index.html
Merge branch 'master' of https://github.com/shanghaishule/myhuai.git
Merge branch 'master' of https://github.com/shanghaishule/myhuai.git
TEST