~~
Merge branch 'master' of https://github.com/LitQoo/cocos2dx-extension-dg

Conflicts:
	CCBReader/CCBAnimationManager.h