Update and modify some source code
Merge branch 'master' of https://github.com/gxcsoft/yii2base

Conflicts:
	views/admin/tenant/_form.php