Update des Android Studios! 1.0.1 oder so...
Merge branch 'master' of https://github.com/fdeitelhoff/GeoSchnitzeljagd

Conflicts:
	.idea/gradle.xml
	app/build.gradle
	gradle/wrapper/gradle-wrapper.properties