Endret design på login
Merge branch 'master' of https://github.com/digipost/android

Conflicts:
	AndroidManifest.xml