changed customObjectMarshaller name so that spring bean registration doesn't override this
Merge branch 'develop' of github.com:MetadataRegistry/ModelCataloguePlugin into develop
Merge branch 'develop' of github.com:MetadataRegistry/ModelCataloguePlugin into develop
added extension value marshaller (should have been in here)