Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
fixed #2094: Position error when contentsize is set with a very short string.
Merge pull request #900 from Wu-Hao/master

fixed #2094: Position error when contentsize is set with a very short string.
fixed #2095: cc.LabelTTF multi line optimization in WebGL mode
fixed #2082 fixed a bug of cc.EaseElastic, Sync parameters of cc.LabelAtlas's initWithString function to Cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into Iss2082_FixSomeBugs
Merge pull request #903 from Wu-Hao/master

fixed #2095: cc.LabelTTF multi line optimization in WebGL mode
Merge pull request #904 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 fixed a bug of cc.EaseElastic, Sync parameters of cc.LabelAtlas's initWithString function to Cocos2d-x
fixed #2085: update submodule commit ID
Merge pull request #905 from linshun/iss2085_v2.1.2beta2

fixed #2085: update submodule commit ID
fixed #2082 modify codes of cc.setBlending to fit WebGL's bug
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into Iss2082_FixSomeBugs
fixed #2085: update submodule commit ID
Merge pull request #906 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 modify codes of cc.setBlending to fit WebGL's bug
Merge pull request #907 from linshun/iss2085_v2.1.2beta2

fixed #2085: update submodule commit ID
issue #2085: update submodule commit ID.
Merge pull request #908 from linshun/iss2085_v2.1.2beta2

issue #2085: update submodule commit ID.
issue #2085: update version number.
Merge pull request #909 from linshun/iss2085_v2.1.2beta2

issue #2085: update version number.