FIX: try to fix merge (unclear)
Merge branch 'master' of https://github.com/jeanin92/DieVerrueckteSightseeingtour