Przygotowania do diagramu OR
Merge branch 'master' of https://github.com/Celebes/msk-pierzch

Conflicts:
	msk-bpmn-engine/src/pl/edu/wat/msk/smo_events/ZakonczObslugeInfiniteGeneric.java