Fixed #5540: Refactor ccui.TextAtlas setStringValue to setString
Merge pull request #1911 from pandamicro/develop

Fixed #5540: Refactor ccui.TextAtlas setStringValue to setString
fixed cc.Skin bounding box calculation for canvas rendering
Issue ##5548: May create an empty action
Merge pull request #1915 from VisualSJ/develop-5548

Issue ##5548: May create an empty action
Merge pull request #1912 from tovchenko/develop

fixed cc.Skin bounding box calculation for canvas rendering
Fixed #5556: Make FadeIn support only duration as parameter
This action should always animate node's opacity to 255
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #1922 from pandamicro/develop

Fixed #5556: Make FadeIn support only duration as parameter
Temporary removal of assert
Merge pull request #1926 from VisualSJ/develop-123

Temporary removal of assert
Follow up the code - #5501
fixed: one-loop CCArmatureAnimation can't finish when setSpeedScale is less than 1.0;
fixed: an obvious layout bug;
Merge pull request #1929 from mutoo/develop

fixed some bugs.
add render
Follow up the code - #5614
Follow up the code - #5614
Follow up the code - #5668
Closed #3546: Added bake function to cc.Layer