Some changes
Merge branch 'devAndroid' of https://github.com/MachDeinSpiel/MdsAndroid into devAndroid

Conflicts:
	MdsAndroid/src/de/hsbremen/mds/android/ingame/MainActivity.java