Merge branch 'develop' of gitee.com:karson/fastadmin into develop

# Conflicts:
#	application/admin/command/Crud.php
#	application/common/library/Upload.php
#	public/assets/js/require-form.js