Merge pull request #5 from cocos2d/develop

Pull down updates from cocos2d:develop #4
Merge pull request #6 from cocos2d/develop

Pull down updates from cocos2d:develop #5
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