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.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into develop