No need to edit version code in LoginActivity, is taken from Manifest
now
Others are now displayed
Merge branch 'master' into alcros-dev

Conflicts:
	Vertretungsplan/res/values/strings.xml
Changed launcher icon set