Fixing #14
Beta Release.
Merge branch 'development'

Conflicts:
	mensa-ubi/AndroidManifest.xml