Add merge infrastructure for traces
Merge branch 'feature-path-exploration' of github.com:cs-au-dk/Artemis into feature-path-exploration