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
add dumpAudioInfo and touchEvent for mobile.
add dumpAudioInfo and touchEvent for mobile.
Merge pull request #2449 from pandamicro/develop

Fix incorrect check in ccui.CheckBox init
Fixed filename is undefined of csLoader
Merge pull request #2450 from VisualSJ/develop-csb

Fixed filename is undefined of csLoader
Merge pull request #2448 from wuzhiming/develop_audio

add dumpAudioInfo and touchEvent for mobile.
Fixed cc.Node._StateCallbackType is undefined
Fixed cc.Node._StateCallbackType is undefined
Merge pull request #2452 from VisualSJ/develop-audio

Fixed cc.Node._StateCallbackType is undefined
issue #1108: add two method cleanScript and restart
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