merge
Merge remote-tracking branch 'Remote/TCA-Team' into TCA-Team

Conflicts:
	TumCampusApp/bin/TumCampusApp.apk
	TumCampusApp/bin/classes.dex
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/R$string.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/R$style.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/R$xml.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/CalendarActivity$1.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/CalendarActivity$4.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/CalendarActivity.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/GradesActivity$1.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/GradesActivity$2.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/GradesActivity.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/activities/StartActivity.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/auxiliary/Const.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/fragments/StartSectionFragment$1.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/fragments/StartSectionFragment.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/preferences/UserPreferencesActivity$1.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/preferences/UserPreferencesActivity$2.class
	TumCampusApp/bin/classes/de/tum/in/tumcampusapp/preferences/UserPreferencesActivity$3.class
	TumCampusApp/bin/resources.ap_
	TumCampusApp/gen/de/tum/in/tumcampusapp/R.java
modified preference string for InApp-Tutorial