Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Authored by ronaldv on Jan 21 2019, 10:53 AM.