Code cleanup
Merge branch 'master' of https://github.com/forsen/Nettbutikk.git
Merge branch 'master' of https://github.com/forsen/Nettbutikk.git