Basis Startscreen hinzugefügt
Merge branch 'master' of https://github.com/ganddev/MAPH.git

Conflicts:
	Android/res/layout/main.xml