同步
Merge branch 'master' of https://github.com/HappySL/qwerty

Conflicts:
	SkinLab.xcodeproj/project.pbxproj
	SkinLab/SettingView/SettingViewController.m