Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding into 14-new-deployment-with-base-and-code

# Conflicts:
#	branding/constants/links.js
#	branding/locales/html/de/code-of-conduct.html
#	branding/locales/html/de/data-privacy.html
#	branding/locales/html/de/faq.html
#	branding/locales/html/de/imprint.html
#	branding/locales/html/de/terms-and-conditions.html
#	branding/locales/html/en/code-of-conduct.html
#	branding/locales/html/en/data-privacy.html
#	branding/locales/html/en/faq.html
#	branding/locales/html/en/imprint.html
#	branding/locales/html/en/terms-and-conditions.html
#	docker/maintenance.Dockerfile
#	docker/webapp.Dockerfile

README.md

@@ -9,7 +9,7 @@ This repository is an in use template to rebrand, configure, and deploy [ocelot.
 <!-- [![Open Source Helpers](https://www.codetriage.com/human-connection/human-connection/badges/users.svg)](https://www.codetriage.com/human-connection/human-connection) -->
 
 <p align="center">
-  <img src="branding/static/img/custom/welcome.svg" alt="Ocelot-Social" width="40%" height="40%">
+  <img src="branding/static/img/custom/logo-squared.svg" alt="Ocelot-Social" width="40%" height="40%">
 </p>
 
 <!--
@@ -40,7 +40,7 @@ Afterwards you can [deploy](deployment/README.md) it on your server:
 
 Join our friendly open-source community on [Discord](https://discord.gg/AJSX9DCSUA) :heart_eyes_cat:
 Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard:
-Check out the [contribution guideline](./CONTRIBUTING.md), too!
+Check out the [contribution guideline](https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CONTRIBUTING.md), too!
 
 We give write permissions to every developer who asks for it. Just text us on
 [Discord](https://discord.gg/AJSX9DCSUA).