Merge branch 'master' of...

Merge branch 'master' of git.card10.badge.events.ccc.de:card10/companion-app-android into navigation
1 job for navigation in 2 minutes and 20 seconds (queued for 2 seconds)