Updated to match cocos2d-x v2.2.5
Updated to latest master for cocos2d-console.