so far
so far
Fin text och bytt bakgrundbild, stora öl flaskor
Merge branch 'cache' into omOss

Conflicts:

BeerDev/BeerDev.xcodeproj/project.xcworkspace/xcuserdata/maximfrisk.xcus
erdatad/UserInterfaceState.xcuserstate
Merge branch 'omOss' of https://github.com/BeerDev/iOSapp into omOss

Conflicts:

BeerDev/BeerDev.xcodeproj/project.xcworkspace/xcuserdata/maximfrisk.xcus
erdatad/UserInterfaceState.xcuserstate
Revert "Merge branch 'omOss' of https://github.com/BeerDev/iOSapp into omOss"

This reverts commit 7f3a785215a2e926879cab4b1386dc23b1501184, reversing
changes made to b8d17f369506ef29bf4c7a2fbc2ae2ace0c332ac.
Merge branch 'omOss' into cache