first Code-Merge
Merge branch 'master' of https://github.com/mschwipps/DAV_copy