Merge pull request cocos2d#1157 from dingpinglv/Iss2844_RenameVersion

Closed cocos2d#2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2

Merge pull request cocos2d#1145 from dingpinglv/DevelopToMaster

Merge develop to master

Merge pull request cocos2d#1043 from linshun/iss2580_v2.1.5

Merged v2.1.5 to master branch

Merge pull request cocos2d#971 from dingpinglv/Iss2144_FixBugForParti…

…cleSystem

fixed cocos2d#2144 modify condition for WebGL Mode.

Merge pull request cocos2d#914 from linshun/iss2085_v2.1.2beta2

issue cocos2d#2085: change version number.

Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5

Merge https://github.com/cocos2d/cocos2d-html5 into webgl20

Merge https://github.com/cocos2d/cocos2d-html5

Merge pull request cocos2d#584 from dingpinglv/iss1509_UpdateMenuTest

fixed cocos2d#1509 correct bug of cc.Follow

Merge pull request cocos2d#522 from linshun/iss1446_v2.0

issue cocos2d#1446: fixed v2.0 version