修正了一些列bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/js/app/settings/index.js