Merge branch 'master' of https://github.com/zoujingli/ThinkAdmin

# Conflicts:
#	vendor/autoload.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php