Login screen
Merge branch 'master' of https://github.com/FnTm/location-sharing-android

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/styles.xml