cocos2d/cocos2d-js#1108: Fix audioEngine absent issue
Merge pull request #2491 from pandamicro/develop

cocos2d/cocos2d-js#1108: Fix audioEngine absent issue
Fixed #2416: fixed a bug of cc.RenderTexture
Merge branch 'Iss2416_RefactorRenderer' of https://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer
Fixed #2416: add a condition to TMXLayer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2416_RefactorRenderer
Merge branch 'Iss2416_RefactorRenderer' of http://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer

Conflicts:
	cocos2d/tilemap/CCTMXLayer.js