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

Conflicts:
	SkinLab.xcodeproj/project.xcworkspace/xcshareddata/SkinLab.xccheckout
ceshi