Remainder tested and working
git cleanup
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Project/target/classes/META-INF/MANIFEST.MF
	Project/target/classes/META-INF/maven/org.activiti.examples/activiti-examples/pom.properties
	bakewell/.bpmn/src/main/resources/diagrams/ProductCreation_v3_daniel_notfinished.bpmn2d
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	bakewell/.bpmn/src/main/resources/diagrams/ProductCreation_v3_daniel_notfinished.bpmn2d