df
Merge github.com:Aurze/DevLivery

Conflicts:
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/1a Supprimer un restaurant.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/1a Supprimer un restaurant.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/1b Modifier restaurant.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/1b Modifier restaurant.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/3a Ajouter sans restaurateur.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/3a Ajouter sans restaurateur.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/F1 – Gérer restaurant.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/1 - Restaurants (F1)/F1 – Gérer restaurant.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/1a Supprimer restaurateur.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/1a Supprimer restaurateur.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/1b Modifier restaurateur.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/1b Modifier restaurateur.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/2a Ajouter sans restaurant.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/2a Ajouter sans restaurant.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/F8 – Gérer restaurateur.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/2 - Restaurateurs (F8)/F8 – Gérer restaurateur.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/2a Ajouter menu sans nom.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/2a Ajouter menu sans nom.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/3a Ajouter plat sans description.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/3a Ajouter plat sans description.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/3b Ajouter plat sans nom et prix.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/3b Ajouter plat sans nom et prix.sequencediagram.layout
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/F5 – Gérer menu.sequencediagram
	trunk/DevLivery/DevLiveryModeling/Iteration 1/3 - Menu (F5)/F5 – Gérer menu.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/1a Supprimer un restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/1a Supprimer un restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/1b Modifier restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/1b Modifier restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/3a Ajouter sans restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/3a Ajouter sans restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/F1 – Gérer restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/1 - Restaurants (F1)/F1 – Gérer restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/1a Supprimer restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/1a Supprimer restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/1b Modifier restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/1b Modifier restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/2a Ajouter sans restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/2a Ajouter sans restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/F8 – Gérer restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/2 - Restaurateurs (F8)/F8 – Gérer restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/2a Ajouter menu sans nom.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/2a Ajouter menu sans nom.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/3a Ajouter plat sans description.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/3a Ajouter plat sans description.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/3b Ajouter plat sans nom et prix.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/3b Ajouter plat sans nom et prix.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/F5 – Gérer menu.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/3 - Menu (F5)/F5 – Gérer menu.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/1a Supprimer un restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/1a Supprimer un restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/1b Modifier restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/1b Modifier restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/3a Ajouter sans restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/3a Ajouter sans restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/F1 – Gérer restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F1 - Restaurants/DSS/F1 – Gérer restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/2a Ajouter menu sans nom.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/2a Ajouter menu sans nom.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/3a Ajouter plat sans description.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/3a Ajouter plat sans description.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/3b Ajouter plat sans nom et prix.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/3b Ajouter plat sans nom et prix.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/F5 – Gérer menu.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F5 - Menu/DSS/F5 – Gérer menu.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/1a Supprimer restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/1a Supprimer restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/1b Modifier restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/1b Modifier restaurateur.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/2a Ajouter sans restaurant.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/2a Ajouter sans restaurant.sequencediagram.layout
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/F8 – Gérer restaurateur.sequencediagram
	trunk/DevLivery/ModelingProject1/Iteration 1/F8 - Restaurateurs/DSS/F8 – Gérer restaurateur.sequencediagram.layout