Merge branch 'jm/vehicular-services' of dev.kom.e-technik.tu-darmstadt.de:simonstrator/simonstrator-peerfactsim into jm/vehicular-services