Merge branch 'master' of...

Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/parameter-catalogs-ecore/demo-catalog-eclipse.git

Conflicts:
	org.example.democatalog.application/.classpath
	org.example.democatalog.application/META-INF/MANIFEST.MF
	org.example.democatalog.application/org.example.democatalog.application.product
	org.example.democatalog.model/META-INF/MANIFEST.MF
	org.example.democatalog.model/model/democatalog.aird
	org.example.democatalog.model/model/democatalog.ecore
	org.example.democatalog.model/model/democatalog.genmodel
	org.example.democatalog.model/src-gen/org/example/democatalog/Inverter.java
	org.example.democatalog.model/src-gen/org/example/democatalog/impl/DemocatalogPackageImpl.java
	org.example.democatalog.model/src-gen/org/example/democatalog/impl/InverterImpl.java