optimize
Merge remote-tracking branch 'origin/develop' into optimizeForMobileBrowser
Fix handling of contentScaleFactor != 1

fixes for Sprite, scale9Sprite, and LabelTTF.
performance improvement for contentScaleFactor fix in Sprite.draw
Merge remote-tracking branch 'upstream/develop' into contantScaleFactorFixes
fixed sync reference of submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into FixedAddCloneToActionProgressTimer
Merge pull request #1026 from dingpinglv/FixedAddCloneToActionProgressTimer

fixed sync reference of submodules
fixed #2380 updated changelog and authors
Merge pull request #1027 from dingpinglv/Iss2380_V215Release

fixed #2380 updated changelog and authors
Fixed javascript compress
Merge pull request #1028 from xingsenma/other

Fixed javascript compress
fixed #2380 updated reference of submodule
optimize
optimize
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