auto classpath
Merged from development.
Conflicts:
	mensa-ubi/.classpath
	mensa-ubi/AndroidManifest.xml
	mensa-ubi/src/de/atomfrede/android/mensa/ubi/activity/LocationSelectionActivity.java