fixed #4853:fix bug cc.winSize incorrect when using setDesignResolutionSize
fix setDesignResolutionSize bug
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0

Conflicts:
	cocos2d/core/platform/CCEGLView.js
Merge pull request #1778 from joshuastray/develop-3.0

 fixed #4853:fix bug cc.winSize incorrect when using setDesignResolution...
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into develop-3.0