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
fixed Scale9Sprite size on canvas renderer with contentScaleFactor != 1;
fixed RenderTexture size on canvas renderer with contentScaleFactor != 1;
fixed colorized progress timer rendering on canvas;
Merge pull request #2454 from musikov/develop

Scale9Sprite size, RenderTexture size, colorized progress timer fix on canvas renderer
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
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
Fixed Pause All audio without background music error
Merge pull request #2460 from VisualSJ/develop-audio

Fixed Pause All audio without background music error
Fixed name error
Merge pull request #2462 from VisualSJ/develop-lineHeight

Fixed name error