for index
Merge branch 'master' of https://github.com/huiguilin/trunk

Conflicts:
	App/Tpl/Home/Index/index.html