All shapes now inherit Shape class, not Mesh
Merge branch 'develop-0.1.x' into develop-0.2.0