Test
Merge branch 'master' of
ssh://git@github.com/PhilippGrulich/HAW-SE2-projecthorse.git

Conflicts:
	android/src/com/haw/projecthorse/android/AndroidLauncher.java