Merge in cocos2d-x 2.2 & MS cocos2d-x cocoa folder changes