Abstände entfernt
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/src/main/java/ch/dolphin/test/MainActivity.java