Signed-off-by: George <gaoshiming@live.com>
Merge branch 'master' of https://github.com/smglg/myweb

Conflicts:
	public/app/modules/views/loginShow.js