Fixed several bugs
Merge branch 'master' of ssh://git@github.com/Teti/UTBM_Carpooling.git

Conflicts:
	AndroidManifest.xml