Merge pull request #387 from jtwigg/develop

Develop
Updates Cocos2D
Updates version in plist
Fixes alignment in physics body editor
Fixes naming in physics joints
Adds more spacing below separators in the inspector
Fixes alignment and sizes of new property types
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop