login
Merge branch 'master' of https://github.com/hu-fulp/android-app

Conflicts:
	app/src/main/res/values/strings.xml