some db stuff
Merge branch 'master' of github.com:finninde/fellesprosjekt