New Version Release 

Version Name 1.7 Version Code 5
Removed old screenshot from readme.
Merge branch 'development'

Conflicts:
	mensa-upb/AndroidManifest.xml
Updated arrays
Merge branch 'development'

Conflicts:
	mensa-upb/AndroidManifest.xml
Resolved Conflict, new Version Bump
Merge branch 'development'

Conflicts:
	mensa-upb/AndroidManifest.xml
Release 2.0.0
Merge branch 'development'

Conflicts:
	mensa-upb/AndroidManifest.xml
	mensa-upb/pom.xml
Update README.md
Removed old app.
Project Restart with android studio and directly parsing website.
Added pub and basilica hamm
Uodated git ignore.
Added Opening Times.
Updated Dateformat.
Updated Dateformat.
Updated build tools
Merge branch 'no-xml' into development

Conflicts:
	mensa-upb/.classpath
	mensa-upb/.settings/org.eclipse.core.resources.prefs
	mensa-upb/AndroidManifest.xml
	mensa-upb/pom.xml
	mensa-upb/res/layout/activity_main.xml
	mensa-upb/src/main/java/de/atomfrede/android/mensa/upb/common/LocationSelectionActivity.java