something useless
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/marvin/mapsexample/MapsActivity.java
	app/src/main/java/com/marvin/mapsexample/OSScreen.java
Merge branch 'master' of https://github.com/Ultreia-/MapsExample-master