diverse småfix
Merge branch 'master' of https://github.com/forsen/nettbutikk.git