前后台目录结构改变
Merge branch 'master' into robin

Conflicts:
	index.php
	protected/modules/user/controllers/RegistrationController.php
前后台入口修改
Merge branch 'master' into robin

Conflicts:
	index.php
合并后修复文件

1
UC同步修改密码

1