fixed #2138 PluginX HelloSocial
Merge pull request #1033 from linshun/iss2580_v2.1.5

issue #2580: Merged  v2.1.5 to master branch
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into optimizeForMobileBrowser
fixed a bug of cc.BuilderReader that it can't load ccbi resource when length of ccbFilePath equal 4
Merge pull request #1034 from dingpinglv/FixedCCBReaderBug

fixed a bug of cc.BuilderReader that it can't load ccbi resource when length of ccbFilePath equal 4
fixed #2138 add copyright information
Merge pull request #1032 from ShengxiangChen/issue2138_pluginx

fixed #2138 PluginX HelloSocial

Thanks
Merge branch 'contantScaleFactorFixes' of https://github.com/MarkEHenderson/cocos2d-html5 into ContentScaleFactorNotEqual1
Fixed delete cc.DictMaker ,because it is excess
Merge remote-tracking branch 'origin/develop' into other
Fixed delete rootDict
Merge pull request #1035 from xingsenma/other

Fixed delete cc.DictMaker ,because it is excess
Merge pull request #1036 from linshun/iss2580_v2.1.5

issue #2580: Merged plugin-x and some bug fixing to master branch
Merge remote-tracking branch 'origin/master' into optimizeForMobileBrowser
Test ContentScaleFactor NotEqual 1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into ContentScaleFactorNotEqual1
Fix handling of contentScaleFactor != 1
fixed #2380 updated reference of submodule
Merge pull request #1038 from dingpinglv/Iss2380_V215Release

fixed #2380 updated reference of submodule
Merge pull request #1037 from dingpinglv/ContentScaleFactorNotEqual1

Fix handling of contentScaleFactor != 1