issue #4221 fixed a bug for layout
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0-new
Merge pull request #1673 from xingsenma/develop-3.0

issue #4221 fixed a bug for layout