Merge branch 'activiti-5.11-dataobjects-0.0' into activiti-5.11-dataobjects-0.1

Conflicts resolved:
	modules/activiti-engine/src/main/java/de/hpi/uni/potsdam/bpmnToSql/DataObject.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BpmnActivityBehavior.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
	modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/runtime/AtomicOperationActivityExecute.java
	modules/activiti-webapp-rest2/src/main/resources/db.properties