FIXMEs and TODOs tackled
Merge remote-tracking branch 'origin/attempt3' into attempt3

Conflicts:
	pssif/pssif.core/src/main/java/de/tum/pssif/core/metamodel/impl/MetamodelImpl.java