修改控制器的数据库
Merge branch 'master' of https://github.com/perali/simshut.git

Conflicts:
	app/other/templates_c/bbb86b32c1bfee202229dd55c10ed3f983ce70b0.file.index.tpl.php