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

Conflicts:
	app/constants.php
	app/views/layout.blade.php
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php