MC-373 & MC340
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePlugin/grails-app/conf/ModelCatalogueConfig.groovy
no message
MC-366, MC-368
changes to support current import process and integration tests etc.
Fixing integration tests
latest changes - still trying to ix hibernate optimistic locking error
fixed integration tests and underlying hasMany/belongsTo mapping between catalogue element and Mapping
Merge branch 'feature/publishing_stuff' into develop
fixing karma tests with new data