Merge branch 'tm/master-thesis-bjoern-bueschke' of...

Merge branch 'tm/master-thesis-bjoern-bueschke' of ssh://dev.kom.e-technik.tu-darmstadt.de/simonstrator/simonstrator-peerfactsim into tm/master-thesis-bjoern-bueschke