for pull
Merge branch 'master' of https://github.com/peete-q/assets

Conflicts:
	lua/GameStage.lua
	lua/SpaceStage.lua
up
fix bug