继续测试
Merge branch 'master' of https://github.com/kingzeus/CocosBuilder

Conflicts:
	version.xml