自动更新修正
自动更新优化
Merge branch 'master' of https://github.com/kingzeus/CocosBuilder

Conflicts:
	CHANGELOG