adding star umlj importer
no message
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop
adding copfescript for umlj importer
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/actions.coffee
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop
adding action to import umlj
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/actions.coffee
	ModelCatalogueCorePlugin/grails-app/controllers/org/modelcatalogue/core/DataImportController.groovy
changes to data import controller after merge and star uml service spec
renaming star uml file
renaming file
don't ignore star uml class
renaming file
renaming file
adding star uml importer branch
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePluginTestApp/grails-app/conf/DataSource.groovy
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePlugin/grails-app/controllers/org/modelcatalogue/core/DataImportController.groovy
	ModelCatalogueCorePlugin/test/integration/org/modelcatalogue/core/DataImportControllerSpec.groovy