without transport proxy
Merge branch 'master' of github.com:University-of-Potsdam-MM/UP.App