Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	jbpm-data-modeler-editor/jbpm-data-modeler-editor-client/src/main/java/org/jbpm/datamodeler/editor/client/editors/DataObjectEditor.ui.xml