ddd
Merge branch 'master' of github.com:IEG-MiniGame-Heros/SYSGame

Conflicts:
	Classes/AppDelegate.cpp
	Classes/Character.cpp
	Classes/Comm.h
	Classes/Effect.cpp
	Classes/EntityManager.h
	Classes/FireBall.cpp
	Classes/FirstStage.cpp
	Classes/GameInfo.cpp
	Classes/Goods.cpp
	Classes/Hero.cpp
	Classes/Hero.h
	Classes/Monster.cpp
	Classes/SkillFireAttack.cpp
	Database/create_table.sql
Merge branch 'master' of github.com:IEG-MiniGame-Heros/SYSGame

Conflicts:
	Classes/Queue.cpp
Merge branch 'master' of github.com:IEG-MiniGame-Heros/SYSGame
增加GameHelper