iphone high res buttons test
loginbutton
now using primary display from sru and as fallback from daia ref #187
Merge branch 'master' of https://github.com/University-of-Potsdam-MM/UP.App
fixed merge conflicts