More changes!
Merge branch 'master' of https://github.com/sdimunzio/BPMN

Conflicts:
	ActivityCoding.bpmn