fixed #2246 Fixed a bug of cc.ScrollView that position of cc.ScrollView is wrong when it's parent node moved
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2246_FixBugForScrollView
Merge pull request #953 from dingpinglv/Iss2246_FixBugForScrollView

fixed #2246 Fixed a bug of cc.ScrollView that position of cc.ScrollView is wrong when it's parent node moved
fixed #2245 Fix a bug of cc.EditBox that position of Dom Element is wrong when cc.EditBox skewed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2245_FixBugForEditBox
Merge pull request #955 from dingpinglv/Iss2245_FixBugForEditBox

fixed #2245 Fixed a bug of cc.EditBox that position of Dom Element is wrong when cc.EditBox scaled
Merge branch 'issue2039_mainJS' of https://github.com/ShengxiangChen/cocos2d-html5 into test
issue #2039: renamed main.js to boot.js
Merge pull request #1 from linshun/test

 issue #2039: renamed main.js to boot.js