Closed #3842: fixed cc.EditBox's position is wrong with the new EGLView logic
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Merge pull request #1519 from dingpinglv/Iss3842_CCEditbox

Closed #3842: fixed cc.EditBox's position is wrong with the new EGLView logic
Merge pull request #1518 from pandamicro/develop

Fixed #3841: Use event on cc.canvas to make full screen request
Fixed #3825: add a white list to simpleAudioEngine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Fixed #3825: modify _maxAudioInstance value
Merge pull request #1520 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: add a white list to simpleAudioEngine
Fixed #3825: update the multiple audio white list
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Fixed #3825: Delete the test codes.
Merge pull request #1521 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: update the multiple audio white list
Merge pull request #1523 from pandamicro/develop

Fixed #3840: Removed in/hasOwnProperty usage in engine
Fixed #3825: fixed a bug of SimpleAudioEngineForMobile that the isMusicPlaying status is wrong
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Merge pull request #1525 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: fixed a bug of SimpleAudioEngineForMobile that the isMusicPlaying status is wrong
Fixed #3825: modify SimpleAudioEngine's _maxAudioInstance to 5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Merge pull request #1526 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: modify SimpleAudioEngine's _maxAudioInstance to 5
Merge pull request #1527 from pandamicro/develop

Fixed #3860: A warning message is proposed when name conflict detected in plist files