Revert "Revert "Merge pull request #3 from camunda/master""

This reverts commit 97109133d042bb1db81dedb3216fc441abd79d96.

Conflicts:
	org.camunda.bpm.modeler/src/org/camunda/bpm/modeler/core/features/AbstractAddBpmnShapeFeature.java
	org.camunda.bpm.modeler/src/org/camunda/bpm/modeler/ui/property/tabs/util/HelpText.java