修正部分后台文件
Merge branch 'master' into robin

Conflicts:
	protected/config/back.php
	protected/config/front.php
	protected/modules/user/components/UserIdentity.php
修正部分后台文件
Merge branch 'master' into robin

Conflicts:
	.gitignore
修改商品管理界面

旧视图文件改为old__form