sync with cocos2d-x version 2.1rc0-x-2.1.4
Merge branch 'master' of https://github.com/totallyevil/cocos2d-xna