optimize
Merge remote-tracking branch 'origin/develop' into optimizeForMobileBrowser
optimize
optimize
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into optimizeForMobileBrowser
Merge remote-tracking branch 'origin/master' into optimizeForMobileBrowser
Merge pull request #1039 from linshun/iss2580_v2.1.5

issue #2580: merged v2.1.5 to master branch
Merge remote-tracking branch 'origin/develop' into optimizeForMobileBrowser
Create CNAME
fixed #2452:optimize javascript code
fixed #2452:optimize javascript code
fixed a bug of cc.Sprite that it's wrong when call _changeTextureColor function
Merge pull request #1042 from dingpinglv/ContentScaleFactorNotEqual1

fixed a bug of cc.Sprite that it's wrong when call _changeTextureColor function
fixed #2454 Fix a bug of EditBox that position is wrong when _resolutionPolicy of EGLView is NOBORDER
Merge pull request #1041 from ShengxiangChen/optimizeForMobileBrowser

fixed #2452:Optimize for mobile browser
Merge pull request #1045 from dingpinglv/Iss2454_FixEditBoxBug

fixed #2454 Fixed a bug of EditBox that position is wrong when _resolutionPolicy of EGLView is NOBORDER
Merge github.com:crosslife/crosslife.github.io
Merge github.com:cocos2d/cocos2d-html5
修改首页
删除test