Push congés
changedata + adress
Merge branch 'robin' into test

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java
	restaurantApp/src/com/example/restaurantapp/Lien.java
	restaurantApp/src/com/example/restaurantapp/LoginActivity.java
	restaurantApp/src/com/example/restaurantapp/Restaurant.java
	restaurantApp/src/com/example/restaurantapp/Ville.java
	restaurantApp/src/com/example/restaurantapp/VilleList.java