Merge remote-tracking branch 'origin/develop' into feature-editpolicy

...d.iorm.ui/modules/compartment/CompartmentTypePattern.java

org.framed.iorm.ui/modules/relationship/Literals.java

...med.iorm.ui/modules/relationship/RelationshipPattern.java

...ationship/cardinality/RelationshipCardinalityPattern.java

org.framed.iorm.ui/modules/rolemodel/icon_rolemodel.png

....iorm.ui/modules/roletype/group_constraints/Literals.java

...oup_constraints/RoleGroupOccurrenceConstraintPattern.java

.../modules/roletype/group_constraints/RoleGroupPattern.java

....iorm.ui/modules/roletype/inheritance/RoleInheritance.etl

...e/occurrence_constraints/RoleTypeOccurenceConstraints.etl

...ence_constraints/RoletypeOccurrenceConstraintPattern.java

...orm.ui/modules/roletype/properties/RoleTypeAttsAndOps.etl

...s/roletype/properties/RoleTypeHasAttsAndOpsReference.java

....ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java