tianjia
Merge branch 'master' of https://github.com/Multimillionaires/X1024

Conflicts:
	Classes/LevelEntity.cpp
	Classes/LevelEntity.h
	proj.ios/X1024.xcodeproj/project.pbxproj