last changes on may 13 (testing day 2)
Merge branch 'master' of github.com:ethz-asl/limno-obstacles