Issue #2417: Unified management of browser data
Issue #2024: LabelTTF add setLineHeight
Issue #2417: Add miPhone‘s browser and uc adaptation
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into browser_version
Fix browser version wrong
Issue #2457: Merge webAudio and DOM Audio, Reduce the audioEngine logic
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop-audio

Conflicts:
	cocos2d/audio/CCAudio.js
Modify name
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into browser_version
Merge pull request #2444 from VisualSJ/develop-lineHeight

Issue #2024: LabelTTF add setLineHeight
Issue 2416: Refactor cc.LabelTTF's renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2416_RefactorRenderer
Merge pull request #2446 from VisualSJ/browser_version

Issue #2417: Fixed EGLView
Modify name
Fixed Play webAudio error
Merge pull request #2458 from VisualSJ/develop-audio

Issue #2457: Merge webAudio and DOM Audio, Reduce the audioEngine logic
Issue #2416: refactor cc.LabelTTF's renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2416_RefactorRenderer