MaterialItems setzen
Merge branch 'master' of github.com:scholt/TeachingApp

Conflicts:
	src/de/tobiasfiebiger/mobile/teachapp/MaterialGridFragment.java