update champs preference
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
recupération de PreferenceOpenHelper
corection duplicate méthode