add dok3 to master
Merge branch 'master' of https://github.com/ulrik72/TestMaster into branch1