Removed linebreak
Merge branch 'develop' of github.com:ironjan/MensaUPB into develop

Conflicts:
	build.gradle
Merge branch 'master' of github.com:ironjan/MensaUPB