Revert "Revert "王宇奇""

This reverts commit 4db14559994799c122021d358bb3f1e53d319b98.

Conflicts:
	.idea/workspace.xml
	app/controllers/IndexController.php

app/data/cp_tpl/4ca4b744d523ff77c1a0f65a6dd3ac7261f3fd8f.file.index.htm.
php
	app/tpl/index/index.htm
	common/app/css/index/index.css