Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal