后台重新调整

Signed-off-by: ljc6qx <ljc6qx@gmail.com>
Merge branch 'master' of https://github.com/ljcqx/yiistudio

Conflicts:
	.idea/yiistudio.iml
	protected/data/app2.mysql.sql
	protected/modules/admin/views/public/index.php
	protected/modules/admin/views/public/login.php