Merge branch 'master' into net
Flere endringer pa dbhandlerhawk
Merge branch 'net'