Main activity design
Merge branch 'master' of https://github.com/kevinramage/Convoiturage

Conflicts:
	Convoiturage/src/mmm/convoiturage/MainActivity.java
	Convoiturage/src/mmm/convoiturage/api/services/rest/Server.java