Merge remote-tracking branch 'origin/master' into master_locale
Merge branch 'master_locale' into DDB
merge
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git
into master_locale

Conflicts:
	restaurantApp/src/com/example/restaurantapp/Lien.java
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git
into master_locale

Conflicts:
	restaurantApp/src/com/example/restaurantapp/Lien.java
ajout de certaine methode de lien
test