issue #3690: Rewrite CCNS.js
Merge pull request #1485 from SmallAiTT/iss3690_ccns_dev3.0

issue #3690: Rewrite CCNS.js
Merge pull request #1512 from dingpinglv/Iss3825_SimpleAudioEngine

Fixed #3825: Fixed a bug of SimpleAudioEngine that its state is incorrect
Fixed #3838: Allow retina display only on apple device to resolve the bug
Merge pull request #1514 from pandamicro/develop

Fixed #3838: Allow retina display only on apple device to resolve the bug
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop

Conflicts:
	cocos2d/cocoa/CCNS.js
Fixed #1516: _tileProperties should be a dictionary object
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3825_SimpleAudioEngine
Merge pull request #1517 from dingpinglv/Iss1516_tileProperties

Fixed #1516: cc.TMXTileMap._tileProperties should be a dictionary object
Fixed #3841: Use event on cc.canvas to make full screen request
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
update Tab
Update tab2
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