cocos2d-x 2.2 with 3.2 combine compile passed!
Merge branches 'my_cocos_to_2' and 'my_cocos_to_2' of https://github.com/JohnCrash/cocos2d-x-EDU-Version into my_cocos_to_2