Modify layout
Merge pull request #4268 from nutty898/develop_nutty_modify_layout

[ci skip]Modify layout
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS