Merge branch 'master' of dev.kom.e-technik.tu-darmstadt.de:simonstrator/simonstrator-api into tf/resourcemarket
