fixing bugs
Merge branch 'master' of https://github.com/liliansun/qionghua

Conflicts:
	app/controllers/EventController.php
	app/views/index.blade.php