test
userindex commit
commit userindex controller images
userindex页面
Merge remote-tracking branch 'origin/master' into dev_zxp1

Conflicts:
	protected/components/Controller.php
	protected/runtime/application.log
add
Merge remote-tracking branch 'origin/dev_ztf1' into dev_zxp1

Conflicts:
	protected/runtime/application.log
commit 个人主页
no
Merge remote-tracking branch 'doudou/dev_zxp1' into dev_ztf1

Conflicts:
	protected/runtime/application.log