Conflicts:
	mensa-ubi/.classpath
	mensa-ubi/AndroidManifest.xml
	mensa-ubi/res/layout-sw600dp/activity_location_selection.xml
	mensa-ubi/res/layout-sw600dp/location_selection.xml
	mensa-ubi/res/layout-sw600dp/mensa_row_layout.xml
	mensa-ubi/res/layout-sw600dp/weekly_meal.xml
	mensa-ubi/res/layout/activity_location_selection.xml
	mensa-ubi/res/layout/fragment_location_selection.xml
	mensa-ubi/res/layout/fragment_weekly_meal.xml
	mensa-ubi/res/values/colors.xml
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/Constants.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/LocationSelectionActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/fh/MindenActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/fh/WilhelmBertelsmannActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/hs/owl/DetmoldActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/hs/owl/HoexterActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/hs/owl/LemgoActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/ubi/MensaActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/meals/weekly/ubi/WestendRestaurantActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/adapter/WeekdayPagerAdapter.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/location/LocationSelectionActivity.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/location/LocationSelectionFragment.java
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/meal/WeeklyMealFragment.java