show 10 records on main
Merge branch 'master' of https://github.com/liliansun/qionghua

Conflicts:
	app/controllers/IndexController.php