Merge branch 'master' into test
1.新功能：调整注册功能，同时注册dedecms,bbs,sns
1.新功能：调整注册功能，同时注册dedecms,bbs,sns
1.新功能：调整注册功能，同时注册dedecms,bbs,sns
1.新功能：调整注册功能，同时注册dedecms,bbs,sns
Merge branch 'master' into test
Merge branch 'master' into test
update index style
Merge branch 'master' into test
merge with master
merge with master
merge with master
Merge branch 'master' into test

Conflicts:
	src/templets/zhongyuan/head.htm
merge with master
5.新功能:增加登录头像
Merge branch 'test'