Merge remote-tracking branch 'origin/master'

    Conflicts:
        src/dagsverket/gui/Test.txt