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

Authored by ronaldv on Nov 29 2018, 9:11 AM.