new Icons deleted
Vorbereitung für dynamische Tabs!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/mko/studentbuddy/MainActivity.java