Merge branch 'hotfix-2.3.17' into develop
File management added and various small changes

- Important! Logo images have now moved to a different location! Make sure that you update your settings!
- Site admins can now manage the uploaded image files and the terms of use file via the server settings interface
- add, link, delete files directly from the interface
Merge branch 'hotfix-2.3.18'