update for lay out
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3