bump cocos2d
bump cocos2d
bump cocos2d
Merge branch 'merge/df_current' of git://github.com/asmodehn/WkCocos into game/dragonfall_merge

Conflicts:
	depends/cocos2d-x
cosmetics and cleanups.