Signed-off-by: George <gaoshiming@live.com>
registry ok!

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

Conflicts:
	app.js
	public/app/modules/views/loginShow.js
	public/app/templates/registry.html