ProtectedNode update display color in visit
ProtectedNode update display color in visit
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into 3.2
EGLView setDesignResolutionSize bug that cc._renderContext.setOffset is undefined
Merge pull request #2531 from VisualSJ/3.2

ProtectedNode update display color in visit
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Fixed: It's fixing Armature's setColor
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into setTransform
Fixed: corrected a bug of cc.Armature that it can't setColor
Merge pull request #2533 from dingpinglv/setTransform

Fixed: corrected a bug of cc.Armature that it can't setColor
Correct a bug of cc.AudioEngine and rename boundingBox to getBoundingBox in spine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into setTransform
Merge pull request #2534 from dingpinglv/setTransform

Correct a bug of cc.AudioEngine and rename boundingBox to getBoundingBox in spine
Audio -add if-getPlaying() into touch the playing background music
Merge pull request #2535 from VisualSJ/3.2

Audio -add if-getPlaying() into touch the playing background music
Fixed: corrected a bug of ccs.Armature that it crashed when adding a child to it.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into setTransform
Merge pull request #2536 from dingpinglv/setTransform

Fixed: corrected a bug of ccs.Armature that it crashed when adding a child to it.
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Update Engine Version