MAP GEHT NICHT !!!11
its friday friday.. ;)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
its friday friday.. ;)
its friday friday.. ;)