Fixes issue with positioning of children when changing a parents content size or content size type
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3