CHG: refactor and rename Adapter class
Merge branch 'master' of https://github.com/jeanin92/DieVerrueckteSightseeingtour
CHG: refactor popups