Merge branch 'develop' into X-multipage

Conflicts:
	org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/ValidIdConstraint.java