wip
Merge remote-tracking branch 'origin/master'

Conflicts:
	org.camunda.bpm.modeler/META-INF/MANIFEST.MF
	org.camunda.bpm.modeler/src/org/camunda/bpm/modeler/ui/property/tabs/builder/NamePropertyBuilder.java
	org.camunda.bpm.modeler/src/org/camunda/bpm/modeler/ui/property/tabs/tables/EObjectAttributeEditingSupport.java
	org.camunda.bpm.modeler/src/org/camunda/bpm/modeler/ui/property/tabs/tables/EObjectAttributeTableColumnDescriptor.java