split and join gateway fix
Merge github.com:rihabibi/BPMNTool