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
fix bug
Merge remote-tracking branch 'origin/dev_zxp1'

Conflicts:
	protected/runtime/application.log