Merge cocos2d-x master branch into winrt branch for 2.2 release