Merge branch 'master' of https://github.com/wsjyz/snatch-game

Conflicts:
	scripts/app/views/SettingMenu.lua
Merge branch 'master' of https://github.com/wsjyz/snatch-game