merged develop into master

...cetype/presentation/ResourcetypeActionBarContributor.java

...rtes/mm/resourcetype/presentation/ResourcetypeEditor.java

...mm/resourcetype/presentation/ResourcetypeModelWizard.java

...t.ipd.descartes.mm.resourcelandscape/META-INF/MANIFEST.MF

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

...descartes/mm/containerrepository/ContainerRepository.java

...d/descartes/mm/containerrepository/ContainerTemplate.java

...es/mm/containerrepository/ContainerrepositoryFactory.java

...es/mm/containerrepository/ContainerrepositoryPackage.java

.../mm/containerrepository/impl/ContainerRepositoryImpl.java

...es/mm/containerrepository/impl/ContainerTemplateImpl.java

...tainerrepository/impl/ContainerrepositoryFactoryImpl.java

...tainerrepository/impl/ContainerrepositoryPackageImpl.java

...nerrepository/util/ContainerrepositoryAdapterFactory.java

...m/containerrepository/util/ContainerrepositorySwitch.java

...mm/resourcelandscape/CompositeHardwareInfrastructure.java

...edu/kit/ipd/descartes/mm/resourcelandscape/Container.java

...du/kit/ipd/descartes/mm/resourcelandscape/DataCenter.java

...descartes/mm/resourcelandscape/DistributedDataCenter.java

...escartes/mm/resourcelandscape/HardwareInfrastructure.java