Commit and push 30/04/13
Merge remote-tracking branch 'origin/activitiesRobin'
push de fin de journée
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
Merge branch 'prefeOk'

Conflicts:
	restaurantApp/src/com/example/restaurantapp/DDB/RestaurantRepository.java
Merge branch 'prefeOk'

Conflicts:
	restaurantApp/src/com/example/restaurantapp/DDB/PreferenceRepository.java
	restaurantApp/src/com/example/restaurantapp/Lien.java
recupération de PreferenceOpenHelper
merge prefeOk
Merge branch 'prefeOk'
corection duplicate méthode
Merge branch 'master' into master_locale

Conflicts:
	restaurantApp/gen/com/example/restaurantapp/R.java
	restaurantApp/src/com/example/restaurantapp/DDB/OpenHelper/PreferenceOpenHelper.java
Ajout d'un id dans preference
ajout des methodes de tri de scott
implementation de get_all_reservation_for_date_restaurant

Conflicts:
	restaurantApp/src/com/example/restaurantapp/DDB/ReservationRepository.java