TestChange
Test
Merge remote-tracking branch 'origin/TCA' into MOECKER

Conflicts:
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/CafeteriaActivity.class
	TumCampusApp/src/de/tum/in/tumcampusapp/activities/CafeteriaActivity.java