Merge pull request #1157 from dingpinglv/Iss2844_RenameVersion

Closed #2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
fixed #3160: fixed a bug about the 'fullPathForFilename' when preload text file
Merge pull request #1220 from ShengxiangChen/issue3160_fullpathForFilename

fixed #3106 : fixed a bug about the 'fullPathForFilename' when preload text file