Merge branch 'master' of /home/xbzbing/php_work/yii2-crazydb-blog with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/web.php
admin config完善