Merge branch 'master' into feature/aubio

# Conflicts:
#	.gitlab-ci.yml
#	src/Lichtsteuerung.pro
1 job for feature/aubio in 4 minutes and 26 seconds (queued for 2 seconds)