hej
Merge branch 'omOss1' into cache
minor changes
massa nya goodies
skitfil
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