Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MobileApplikationen.apk
	bin/classes.dex
	bin/classes/com/ma/schiffeversenken/Hilfe.class
	bin/classes/com/ma/schiffeversenken/R$layout.class
	bin/classes/com/ma/schiffeversenken/R$menu.class
	bin/classes/com/ma/schiffeversenken/R$string.class
	bin/classes/com/ma/schiffeversenken/R$style.class
	bin/classes/com/ma/schiffeversenken/Schwierigkeitsstufe.class
	bin/classes/com/ma/schiffeversenken/SpielStarten.class
	bin/classes/com/ma/schiffeversenken/Startseite.class
	bin/resources.ap_
	gen/com/ma/schiffeversenken/R.java
	src/com/ma/schiffeversenken/Hilfe.java