mash geoerde lessons/quiz
Merge branch 'master' of https://github.com/Lessip/GeoErde

Conflicts:
	GeoErde/res/layout/fragment_main.xml
	GeoErde/src/de/tuc/emla/geoerde/MainActivity.java