Map angepasst
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/build.gradle
	build/intermediates/model_data.bin
Map angepasst