Login Activity
Merge branch 'master' of https://github.com/kevinramage/Convoiturage

Conflicts:
	Convoiturage/res/values/strings.xml