购物车
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/config/database.php
	app/views/home/header.php