Merge pull request #1029 from dingpinglv/Iss2380_V215Release

fixed #2380 updated reference of submodule
Fixed 2362 Add a log to notice that schedule parameters can't end with "null"
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2362_AddLogToSchedule
Merge pull request #1030 from dingpinglv/Iss2362_AddLogToSchedule

Fixed 2362 Add a log to notice that schedule parameters can't end with "null"
fixed #2293 fixed a bug of cc.LabelTTF when its stroke or shadow enables on Canvas Mode
fixed #2293 fixed a bug of cc.LabelTTF when its stroke or shadow enables on WebGL Mode
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2362_AddLogToSchedule
Merge pull request #1031 from dingpinglv/Iss2293_FixLabelTTFBug

Fixed #2293 fixed a bug of cc.LabelTTF that It doesn't work when call enableStroke or enableShadow
fixed #2138 PluginX HelloSocial
Merge pull request #1033 from linshun/iss2580_v2.1.5

issue #2580: Merged  v2.1.5 to master branch
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
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
fixed #2380 updated reference of submodule