Updated Cocos2D to 2.1 and Cocos2D-X to 2.1.4