辉，最新
Merge pull request #1 from xiaowenlh/hui

辉辉最新的
Merge pull request #3 from lokiiart/developer

Developer
Merge branch 'backup' into seven

Conflicts:
	app/controllers/GetmsgController.php
	public/img/11.jpg
	public/img/12.jpg
	public/img/13.jpg
	public/img/14.jpg
	public/img/9.jpg
	public/storesimg/16.jpg
	public/storesimg/17.jpg
	public/storesimg/7.jpg