lh
Merge branch 'master' of https://github.com/li1993hao/shangwu

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