branche  pour les tests
Branche pour les actvity blancs
Merge remote-tracking branch 'origin/BranchTest'

Conflicts:
	restaurantApp/src/com/example/restaurantapp/DDB/OriginePlatRepository.java
	restaurantApp/src/com/example/restaurantapp/DDB/PlatRepository.java
	restaurantApp/src/com/example/restaurantapp/DDB/ReservationRepository.java
	restaurantApp/src/com/example/restaurantapp/DDB/RestaurantRepository.java
	restaurantApp/src/com/example/restaurantapp/Lien.java
	restaurantApp/src/com/example/restaurantapp/ListIngr.java
	restaurantApp/src/com/example/restaurantapp/ListeResto.java
	restaurantApp/src/com/example/restaurantapp/LoginActivity.java
	restaurantApp/src/com/example/restaurantapp/MainActivity.java
	restaurantApp/src/com/example/restaurantapp/MakeReserv.java
	restaurantApp/src/com/example/restaurantapp/MenuList.java
	restaurantApp/src/com/example/restaurantapp/MenuTri.java
	restaurantApp/src/com/example/restaurantapp/Origine.java
	restaurantApp/src/com/example/restaurantapp/PagePlat.java
	restaurantApp/src/com/example/restaurantapp/PagedeRestaurannt.java
	restaurantApp/src/com/example/restaurantapp/PersoListPlats.java
	restaurantApp/src/com/example/restaurantapp/PersoTriReserv.java
	restaurantApp/src/com/example/restaurantapp/Plat.java
	restaurantApp/src/com/example/restaurantapp/PlatCategories.java
	restaurantApp/src/com/example/restaurantapp/PlatCategories_reserv.java
	restaurantApp/src/com/example/restaurantapp/PrefAdapter.java
	restaurantApp/src/com/example/restaurantapp/PrefSettings.java
	restaurantApp/src/com/example/restaurantapp/Propriete.java
	restaurantApp/src/com/example/restaurantapp/ReservPlat.java
	restaurantApp/src/com/example/restaurantapp/Reservation.java
	restaurantApp/src/com/example/restaurantapp/Restaurant.java
	restaurantApp/src/com/example/restaurantapp/TriListPlats.java
	restaurantApp/src/com/example/restaurantapp/TriVille.java
	restaurantApp/src/com/example/restaurantapp/Tri_reserv.java
	restaurantApp/src/com/example/restaurantapp/Ville.java
	restaurantApp/src/com/example/restaurantapp/VilleAdapter.java
	restaurantApp/src/com/example/restaurantapp/VilleList.java
	restaurantApp/src/com/example/restaurantapp/VillePage.java
Revert "ajout de la methode give_nb_exemplaire_plat_a_date"

This reverts commit c68f058c9f4b3dd1c90fb2f0624de43c2a853b94.
Revert "Revert "ajout de la methode give_nb_exemplaire_plat_a_date""

This reverts commit 6685a07ac342281c0ad062a9ab48d881a9300d36.
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git
into cyril_essai_merge_after_bug
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git

Conflicts:
	restaurantApp/assets/DDB_V03.sql
	restaurantApp/gen/com/example/restaurantapp/R.java
	restaurantApp/res/layout/activity_client_space.xml
	restaurantApp/src/com/example/activity/ClientSpace.java
	restaurantApp/src/com/example/activity/ClientSpaceReserv.java
	restaurantApp/src/com/example/activity/LoginActivity.java
	restaurantApp/src/com/example/restaurantapp/Client.java
	restaurantApp/src/com/example/restaurantapp/DDB/OpenHelper/CreateBDDOpenHelper.java
Merge branch 'master' of https://github.com/FHachez/restaurantApp.git

Conflicts:
	restaurantApp/src/com/example/restaurantapp/DDB/OpenHelper/CreateBDDOpenHelper.java