Merge pull request #8 from cocos2d/develop

update cocos2d/cocos2d-x
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
Merge pull request #2902 from waiter/master

update "fix a bug that SimpleAudioEngine may cause crash on i9100"