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
remove R.java
Merge branch 'master' into master_locale

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java
	restaurantApp/src/com/example/restaurantapp/DDB/OpenHelper/PreferenceOpenHelper.java