CHG: refactor geraete layout
Merge branch 'master' of https://github.com/jeanin92/DieVerrueckteSightseeingtour

Conflicts:
	DVST/res/layout/geraete.xml