Fix object property merging in shape serialization. Add tests.
Merge pull request #463 from NetLogo/tortoise-shape-serialization

Fix object property merging in shape serialization. Add tests.