Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream1/develop' into develop
fix for simple audio enginee loading and playing error on browser that doesn't support audio tag
Update CCLabelTTF.js

add param context to method visit()
Merge pull request #1106 from WanderWang/develop

Add param context to method visit() in cc.LabelTTF
Merge pull request #1105 from oupengsoftware/taskbranch/SPX-935

fix for simple audio engine loading and playing issue
Closed #2514: Migrate CCBReader to Cocos2d-x v2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2514_MigrateCCBReaderTo2.1.4
Closed #2762: Refactor CCSimpleAudioEngine.js for code maintainability
Merge pull request #1107 from dingpinglv/Iss2514_MigrateCCBReaderTo2.1.4

Closed #2514: Migrate CCBReader to Cocos2d-x v2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2762_RefactorSimpleAudioEngine
fixed #880 add msPointerEnabled support
Merge pull request #1110 from dingpinglv/Iss880_MsPointerEnabled

fixed #880 add msPointerEnabled support
Closed #2748: Fix a bug of cc.Sprite that its children also follow fliped when it fliped
Closed #2748: Fixed a bug of LabelAtlasCanvas, that   _opacity is wrong used.
fixed #2763:fixed ccb parser bug
Closed #2748: Fixed a bug of cc.ProgressTimerCanvas that it is error display  when it flip.
fixed #2763:fixed ccb parser bug
closed #2748: clipping region also must use   save and  restore
Merge pull request #1112 from xingsenma/Flip

closed #2748: Fixed some bugs about flip.