11-07
10-08/添加登录和注册验证
11-10/添加设置中心，更改登录注册验证
Merge remote-tracking branch 'origin/pzhyy'

Conflicts:
	angular_sites/index.html
	angular_sites/js/config/config.js
	angular_sites/views/user-setting-center.html
Merge branch 'master' of https://github.com/wondereamer/templates