Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:jhurt/cocos2d-html5
wrappers to SimpleAudioEngine to account for api differencs from cocos2d-x jsb