Kjetil merge
holder paa med plassering
ferdig med logginn, presenterer delemner adskilt
merged henri
Remove database.shutdown() in tests
Merge branch 'master' of http://github.com/thomasSve/SKS-2.0 into henri