Refactor #3370: adjust container size more properly
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Merge pull request #1468 from pandamicro/develop

Refactor #3370: adjust container size more properly