general settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/sanxiao/scripts/app/class/SpriteItem.lua
	bin/sanxiao/scripts/app/scenes/MainScene.lua