Updated Version Information
Updated classpath
Merge branch 'master' into development
Merge branch 'master' into development
Fix #19

Adapted parser for new webpage structure.
Merge branch 'development'

Conflicts:
	mensa-ubi/AndroidManifest.xml
	mensa-ubi/project.properties
Version Code Update