Merge branch 'master' of https://github.com/pat412/Camunda-BPM-Coffee-Example

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/pat412/Camunda-BPM-Coffee-Example

Conflicts:
	pom.xml