Merge pull request #5 from cocos2d/develop

Pull down updates from cocos2d:develop #4
Merge pull request #1330 from dingpinglv/Iss3371_xxxConst

Fixed #3371: Correct some mistakes for _PointConst
Merge pull request #6 from cocos2d/develop

Pull down updates from cocos2d:develop #5
issue #1758: updated build.xml
issue #1758: updated build.xml for extension.
Merge pull request #1331 from linshun/develop

issue #1758: updated build.xml for new folder structure.
Refactor #3370 : Fixed a bug with viewport meta

The browser size is changed after the set of viewport meta and it makes
the page size different than the size used in ResolutionPolicy
Merge pull request #7 from cocos2d/develop

Pull down updates from cocos2d:develop #7
Merge pull request #1333 from pandamicro/develop

Refactor #3370 : Fixed a bug with viewport meta
Closed #3411: set cc.Rect's origin and size from public to private
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3411_HideRectorigin
fixed #3371: correct a mistake for PointConst