Now there's only one launcher, "Login"
Removed menubar in login activity
Merge branch 'master' of https://github.com/sandbergnilsvictor/MahAppStudent

Conflicts:
	AndroidManifest.xml

Conflict