JONATHAN

HEJ!
Merge branch 'omOss' of https://github.com/BeerDev/AndroidApp into omOss