merged develop into master

edu.kit.ipd.descartes.mm.feature/pom.xml

edu.kit.ipd.descartes.mm.resourcelandscape.edit/.gitignore

....descartes.mm.resourcelandscape.edit/META-INF/MANIFEST.MF

edu.kit.ipd.descartes.mm.resourcelandscape.edit/pom.xml

...rrepository/provider/ContainerRepositoryItemProvider.java

...nerrepository/provider/ContainerTemplateItemProvider.java

...ovider/ContainerrepositoryItemProviderAdapterFactory.java

...e/provider/CommunicationLinkResourceTypeItemProvider.java

...esourcetype/provider/PassiveResourceTypeItemProvider.java

...urcetype/provider/ProcessingResourceTypeItemProvider.java

...es/mm/resourcetype/provider/ResourceTypeItemProvider.java

...urcetype/provider/ResourceTypeRepositoryItemProvider.java

...type/provider/ResourcetypeItemProviderAdapterFactory.java

edu.kit.ipd.descartes.mm.resourcelandscape.editor/.gitignore

...escartes.mm.resourcelandscape.editor/META-INF/MANIFEST.MF

edu.kit.ipd.descartes.mm.resourcelandscape.editor/plugin.xml

edu.kit.ipd.descartes.mm.resourcelandscape.editor/pom.xml

...presentation/ContainerrepositoryActionBarContributor.java

...nerrepository/presentation/ContainerrepositoryEditor.java

...pository/presentation/ContainerrepositoryModelWizard.java