Merge branch 'master' of https://gogs.wineme.fb5.uni-siegen.de/ramonaPlogmann/emilia

# Conflicts:
#	.gitignore
#	client/public/app.webmanifest
#	client/public/index.html