s/r DKK + other stuff
Resolved annoying merge conflict s/r app/application and DKK/dkk