Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
Merge pull request #913 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 correct a mistake for cc.LabelBMFont's static function
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
issue #2085: change version number.
Merge pull request #914 from linshun/iss2085_v2.1.2beta2

issue #2085: change version number.
fixed #2082 fixed a bug of cc.SpriteBatchNode about zOrder, fixed a bug of cc.Sprite's setFlipX/Y on Canvas Mode