From 8cbfcc00e35d679ca59a191a9b5fc2c77ee67c93 Mon Sep 17 00:00:00 2001
From: Nicolas FLEY <nicolas.fley@student.ecp.fr>
Date: Wed, 14 Jun 2017 23:20:45 +0200
Subject: [PATCH] project finished

---
 .gitignore                                    |    8 +-
 Period.java                                   |  112 +-
 doc/Cards/BasicFidelityCard.html              |  657 +--
 doc/Cards/FidelityCard.html                   |  639 +--
 doc/Cards/LotteryFidelityCard.html            |  709 +--
 doc/Cards/PointFidelityCard.html              |  683 +--
 doc/Cards/VisitableCard.html                  |  463 +-
 doc/Cards/VisiterCard.html                    |  463 +-
 doc/Cards/class-use/BasicFidelityCard.html    |  248 +-
 doc/Cards/class-use/FidelityCard.html         |  422 +-
 doc/Cards/class-use/LotteryFidelityCard.html  |  310 +-
 doc/Cards/class-use/PointFidelityCard.html    |  310 +-
 doc/Cards/class-use/VisitableCard.html        |  395 +-
 doc/Cards/class-use/VisiterCard.html          |  330 +-
 doc/Cards/package-frame.html                  |   56 +-
 doc/Cards/package-summary.html                |  354 +-
 doc/Cards/package-tree.html                   |  296 +-
 doc/Cards/package-use.html                    |  391 +-
 doc/Cli/Clui.html                             |  576 ++-
 doc/Cli/Command.html                          |  335 ++
 doc/Cli/Confirm.html                          |  542 +-
 doc/Cli/Input.html                            |  542 +-
 doc/Cli/Token.TypeToken.html                  |  381 ++
 doc/Cli/Token.html                            |  329 ++
 doc/Cli/class-use/Clui.html                   |  248 +-
 doc/Cli/class-use/Command.html                |  310 ++
 doc/Cli/class-use/Confirm.html                |  248 +-
 doc/Cli/class-use/Input.html                  |  248 +-
 doc/Cli/class-use/Token.TypeToken.html        |  185 +
 doc/Cli/class-use/Token.html                  |  163 +
 doc/Cli/class-use/errorWrongFormatValue.html  |  168 +
 .../class-use/errorWrongNumberOfParams.html   |  164 +
 doc/Cli/class-use/errorWrongTypeOfUser.html   |  124 +
 doc/Cli/errorWrongFormatValue.html            |  318 ++
 doc/Cli/errorWrongNumberOfParams.html         |  318 ++
 doc/Cli/errorWrongTypeOfUser.html             |  318 ++
 doc/Cli/package-frame.html                    |   55 +-
 doc/Cli/package-summary.html                  |  350 +-
 doc/Cli/package-tree.html                     |  302 +-
 doc/Cli/package-use.html                      |  321 +-
 doc/Commands/AddDishRestaurantMenu.html       |  296 ++
 doc/Commands/AddDishToMeal.html               |  294 ++
 doc/Commands/AddItemToOrder.html              |  294 ++
 doc/Commands/AssociateCard.html               |  296 ++
 doc/Commands/CreateMeal.html                  |  294 ++
 doc/Commands/CreateOrder.html                 |  294 ++
 doc/Commands/EndOrder.html                    |  294 ++
 doc/Commands/EndOrderAt.html                  |  294 ++
 doc/Commands/FindDeliverer.html               |  294 ++
 doc/Commands/Help.html                        |  291 ++
 doc/Commands/Login.html                       |  291 ++
 doc/Commands/Logout.html                      |  291 ++
 doc/Commands/OffDuty.html                     |  294 ++
 doc/Commands/OnDuty.html                      |  294 ++
 doc/Commands/RegisterCourier.html             |  296 ++
 doc/Commands/RegisterCustomer.html            |  296 ++
 doc/Commands/RegisterManager.html             |  296 ++
 doc/Commands/RegisterRestaurant.html          |  296 ++
 doc/Commands/RemoveSpecialOffer.html          |  294 ++
 doc/Commands/RenameMeal.html                  |  294 ++
 doc/Commands/RunTest.html                     |  291 ++
 doc/Commands/SetDeliveryPolicy.html           |  296 ++
 doc/Commands/SetProfitPolicy.html             |  296 ++
 doc/Commands/SetSpecialOffer.html             |  294 ++
 doc/Commands/ShowCourier.html                 |  291 ++
 doc/Commands/ShowCourierOrdered.html          |  291 ++
 doc/Commands/ShowCustomer.html                |  291 ++
 doc/Commands/ShowMeal.html                    |  294 ++
 doc/Commands/ShowMenuItem.html                |  294 ++
 doc/Commands/ShowProfitBetween.html           |  291 ++
 doc/Commands/ShowRestaurantTop.html           |  291 ++
 doc/Commands/ShowTotalProfit.html             |  291 ++
 .../class-use/AddDishRestaurantMenu.html      |  124 +
 doc/Commands/class-use/AddDishToMeal.html     |  124 +
 doc/Commands/class-use/AddItemToOrder.html    |  124 +
 doc/Commands/class-use/AssociateCard.html     |  124 +
 doc/Commands/class-use/CreateMeal.html        |  124 +
 doc/Commands/class-use/CreateOrder.html       |  124 +
 doc/Commands/class-use/EndOrder.html          |  124 +
 doc/Commands/class-use/EndOrderAt.html        |  124 +
 doc/Commands/class-use/FindDeliverer.html     |  124 +
 doc/Commands/class-use/Help.html              |  124 +
 doc/Commands/class-use/Login.html             |  124 +
 doc/Commands/class-use/Logout.html            |  124 +
 doc/Commands/class-use/OffDuty.html           |  124 +
 doc/Commands/class-use/OnDuty.html            |  124 +
 doc/Commands/class-use/RegisterCourier.html   |  124 +
 doc/Commands/class-use/RegisterCustomer.html  |  124 +
 doc/Commands/class-use/RegisterManager.html   |  124 +
 .../class-use/RegisterRestaurant.html         |  124 +
 .../class-use/RemoveSpecialOffer.html         |  124 +
 doc/Commands/class-use/RenameMeal.html        |  124 +
 doc/Commands/class-use/RunTest.html           |  124 +
 doc/Commands/class-use/SetDeliveryPolicy.html |  124 +
 doc/Commands/class-use/SetProfitPolicy.html   |  124 +
 doc/Commands/class-use/SetSpecialOffer.html   |  124 +
 doc/Commands/class-use/ShowCourier.html       |  124 +
 .../class-use/ShowCourierOrdered.html         |  124 +
 doc/Commands/class-use/ShowCustomer.html      |  124 +
 doc/Commands/class-use/ShowMeal.html          |  124 +
 doc/Commands/class-use/ShowMenuItem.html      |  124 +
 doc/Commands/class-use/ShowProfitBetween.html |  124 +
 doc/Commands/class-use/ShowRestaurantTop.html |  124 +
 doc/Commands/class-use/ShowTotalProfit.html   |  124 +
 doc/Commands/package-frame.html               |   51 +
 doc/Commands/package-summary.html             |  266 +
 doc/Commands/package-tree.html                |  172 +
 doc/Commands/package-use.html                 |  124 +
 doc/Core/ActiveUserContext.html               |  575 ++-
 doc/Core/ContextStrategy.html                 |  475 +-
 doc/Core/Main.html                            |  277 +
 doc/Core/MyFoodora.html                       | 1705 +++---
 doc/Core/class-use/ActiveUserContext.html     |  512 +-
 doc/Core/class-use/ContextStrategy.html       |  354 +-
 doc/Core/class-use/Main.html                  |  124 +
 doc/Core/class-use/MyFoodora.html             |  982 ++--
 doc/Core/package-frame.html                   |   51 +-
 doc/Core/package-summary.html                 |  336 +-
 doc/Core/package-tree.html                    |  285 +-
 doc/Core/package-use.html                     |  531 +-
 .../ContextDeliveryStrategy.html              |  643 +--
 .../FairOccupationDelivery.html               |  576 ++-
 doc/DeliveryStrategy/FastestDelivery.html     |  576 ++-
 .../StrategyDeliveryPolicy.html               |  552 +-
 .../class-use/ContextDeliveryStrategy.html    |  400 +-
 .../class-use/FairOccupationDelivery.html     |  248 +-
 .../class-use/FastestDelivery.html            |  248 +-
 .../class-use/StrategyDeliveryPolicy.html     |  366 +-
 doc/DeliveryStrategy/package-frame.html       |   49 +-
 doc/DeliveryStrategy/package-summary.html     |  327 +-
 doc/DeliveryStrategy/package-tree.html        |  286 +-
 doc/DeliveryStrategy/package-use.html         |  396 +-
 doc/Exception/ExceptionUnknownDishType.html   |  636 +--
 doc/Exception/ExceptionUnknownMealType.html   |  636 +--
 .../ExceptionUnknownStartegyType.html         |  636 +--
 doc/Exception/ExceptionUnknownTypeOfUser.html |  318 ++
 .../class-use/ExceptionUnknownDishType.html   |  557 +-
 .../class-use/ExceptionUnknownMealType.html   |  494 +-
 .../ExceptionUnknownStartegyType.html         |  709 ++-
 .../class-use/ExceptionUnknownTypeOfUser.html |  441 ++
 doc/Exception/package-frame.html              |   45 +-
 doc/Exception/package-summary.html            |  304 +-
 doc/Exception/package-tree.html               |  295 +-
 doc/Exception/package-use.html                |  568 +-
 doc/Item/Dessert.html                         |  534 +-
 doc/Item/Dish.html                            |  777 +--
 doc/Item/FactoryDish.html                     |  570 ++-
 doc/Item/FactoryMeal.html                     |  559 +-
 doc/Item/FullMeal.html                        |  535 +-
 doc/Item/HalfMeal.html                        |  535 +-
 doc/Item/Item.html                            |  661 ++-
 doc/Item/MainDish.html                        |  534 +-
 doc/Item/Meal.html                            |  931 ++--
 doc/Item/MealFactory.html                     |  555 +-
 doc/Item/Starter.html                         |  534 +-
 doc/Item/VisitablePrice.html                  |  446 +-
 doc/Item/VisitorPrice.html                    |  446 +-
 doc/Item/class-use/Dessert.html               |  248 +-
 doc/Item/class-use/Dish.html                  |  629 ++-
 doc/Item/class-use/FactoryDish.html           |  248 +-
 doc/Item/class-use/FactoryMeal.html           |  248 +-
 doc/Item/class-use/FullMeal.html              |  248 +-
 doc/Item/class-use/HalfMeal.html              |  292 +-
 doc/Item/class-use/Item.html                  |  415 +-
 doc/Item/class-use/MainDish.html              |  248 +-
 doc/Item/class-use/Meal.html                  |  650 +--
 doc/Item/class-use/MealFactory.html           |  248 +-
 doc/Item/class-use/Starter.html               |  248 +-
 doc/Item/class-use/VisitablePrice.html        |  400 +-
 doc/Item/class-use/VisitorPrice.html          |  388 +-
 doc/Item/package-frame.html                   |   70 +-
 doc/Item/package-summary.html                 |  428 +-
 doc/Item/package-tree.html                    |  322 +-
 doc/Item/package-use.html                     |  531 +-
 doc/Offers/BirthdayOffer.html                 |  373 ++
 doc/Offers/MealOfTheWeek.html                 |  782 +--
 doc/Offers/ObservableOffer.html               |  502 +-
 doc/Offers/Observer.html                      |  450 +-
 doc/Offers/class-use/BirthdayOffer.html       |  124 +
 doc/Offers/class-use/MealOfTheWeek.html       |  301 +-
 doc/Offers/class-use/ObservableOffer.html     |  336 +-
 doc/Offers/class-use/Observer.html            |  465 +-
 doc/Offers/package-frame.html                 |   51 +-
 doc/Offers/package-summary.html               |  330 +-
 doc/Offers/package-tree.html                  |  285 +-
 doc/Offers/package-use.html                   |  363 +-
 doc/Order/HistoricOrder.html                  |  633 +--
 doc/Order/Order.html                          | 1104 ++--
 doc/Order/class-use/HistoricOrder.html        |  426 +-
 doc/Order/class-use/Order.html                |  563 +-
 doc/Order/package-frame.html                  |   42 +-
 doc/Order/package-summary.html                |  297 +-
 doc/Order/package-tree.html                   |  276 +-
 doc/Order/package-use.html                    |  442 +-
 doc/Others/Adress.html                        |  676 +--
 doc/Others/Date.html                          |  860 ++--
 doc/Others/Historique.html                    |  301 ++
 doc/Others/IDCard.html                        |  506 +-
 doc/Others/Period.html                        |  629 +--
 doc/Others/Position.html                      |  658 +--
 doc/Others/class-use/Adress.html              |  765 +--
 doc/Others/class-use/Date.html                |  507 +-
 doc/Others/class-use/Historique.html          |  124 +
 doc/Others/class-use/IDCard.html              |  328 +-
 doc/Others/class-use/Period.html              |  396 +-
 doc/Others/class-use/Position.html            |  354 +-
 doc/Others/package-frame.html                 |   49 +-
 doc/Others/package-summary.html               |  329 +-
 doc/Others/package-tree.html                  |  283 +-
 doc/Others/package-use.html                   |  498 +-
 .../ContextTargetProfitStrategy.html          |  721 +--
 .../StrategyTargetProfitPolicy.html           |  602 +--
 .../TargetProfitDeliveryCost.html             |  583 +--
 doc/StrategyProfit/TargetProfitMarkup.html    |  583 +--
 .../TargetProfitServiceFee.html               |  583 +--
 .../ContextTargetProfitStrategy.html          |  400 +-
 .../class-use/StrategyTargetProfitPolicy.html |  402 +-
 .../class-use/TargetProfitDeliveryCost.html   |  248 +-
 .../class-use/TargetProfitMarkup.html         |  248 +-
 .../class-use/TargetProfitServiceFee.html     |  248 +-
 doc/StrategyProfit/package-frame.html         |   48 +-
 doc/StrategyProfit/package-summary.html       |  326 +-
 doc/StrategyProfit/package-tree.html          |  288 +-
 doc/StrategyProfit/package-use.html           |  396 +-
 doc/User/Courier.html                         |  976 ++--
 doc/User/Customer.html                        | 1193 +++--
 doc/User/HumanUser.html                       |  593 +--
 doc/User/IDUser.html                          |  505 +-
 doc/User/ListUser.html                        |  762 +--
 doc/User/Manager.html                         | 1393 ++---
 doc/User/MoralUser.html                       |  585 ++-
 doc/User/Restaurant.html                      | 1072 ++--
 doc/User/User.html                            | 1429 +++---
 doc/User/UserFactory.html                     |  283 +
 doc/User/class-use/Courier.html               |  477 +-
 doc/User/class-use/Customer.html              |  429 +-
 doc/User/class-use/HumanUser.html             |  465 +-
 doc/User/class-use/IDUser.html                |  328 +-
 doc/User/class-use/ListUser.html              |  422 +-
 doc/User/class-use/Manager.html               |  380 +-
 doc/User/class-use/MoralUser.html             |  433 +-
 doc/User/class-use/Restaurant.html            |  557 +-
 doc/User/class-use/User.html                  |  665 +--
 doc/User/class-use/UserFactory.html           |  124 +
 doc/User/package-frame.html                   |   57 +-
 doc/User/package-summary.html                 |  372 +-
 doc/User/package-tree.html                    |  309 +-
 doc/User/package-use.html                     |  574 ++-
 .../FactoryUserFactory.html                   |  552 +-
 doc/UserFactoryPattern/HumanUserFactory.html  |  696 +--
 doc/UserFactoryPattern/MoralUserFactory.html  |  696 +--
 doc/UserFactoryPattern/UserFactory.html       |  871 ++--
 .../class-use/FactoryUserFactory.html         |  248 +-
 .../class-use/HumanUserFactory.html           |  248 +-
 .../class-use/MoralUserFactory.html           |  248 +-
 .../class-use/UserFactory.html                |  366 +-
 doc/UserFactoryPattern/package-frame.html     |   46 +-
 doc/UserFactoryPattern/package-summary.html   |  316 +-
 doc/UserFactoryPattern/package-tree.html      |  286 +-
 doc/UserFactoryPattern/package-use.html       |  316 +-
 doc/allclasses-frame.html                     |  215 +-
 doc/allclasses-noframe.html                   |  215 +-
 doc/constant-values.html                      | 1241 +++--
 doc/deprecated-list.html                      |  248 +-
 doc/help-doc.html                             |  458 +-
 doc/index-files/index-1.html                  |  418 +-
 doc/index-files/index-10.html                 |  288 +-
 doc/index-files/index-11.html                 |  417 +-
 doc/index-files/index-12.html                 |  268 +-
 doc/index-files/index-13.html                 |  295 +-
 doc/index-files/index-14.html                 |  292 +-
 doc/index-files/index-15.html                 |  417 +-
 doc/index-files/index-16.html                 |  562 +-
 doc/index-files/index-17.html                 |  563 +-
 doc/index-files/index-18.html                 |  348 +-
 doc/index-files/index-19.html                 |  299 +-
 doc/index-files/index-2.html                  |  270 +-
 doc/index-files/index-3.html                  |  539 +-
 doc/index-files/index-4.html                  |  313 +-
 doc/index-files/index-5.html                  |  502 +-
 doc/index-files/index-6.html                  |  343 +-
 doc/index-files/index-7.html                  |  658 +--
 doc/index-files/index-8.html                  |  304 +-
 doc/index-files/index-9.html                  |  335 +-
 doc/index.html                                |  150 +-
 doc/overview-frame.html                       |   68 +-
 doc/overview-summary.html                     |  374 +-
 doc/overview-tree.html                        |  576 ++-
 doc/package-list                              |   28 +-
 .../entities.ContextDeliveryPolicy.html       |  248 +-
 .../entities.ContextTargetProfit.html         |  248 +-
 .../class-use/entities.Courier.html           |  248 +-
 .../class-use/entities.Customer.html          |  248 +-
 .../class-use/entities.Manager.html           |  248 +-
 .../class-use/entities.Restaurant.html        |  248 +-
 doc/provisoire/class-use/entities.html        |  248 +-
 .../entities.ContextDeliveryPolicy.html       |  482 +-
 .../entities.ContextTargetProfit.html         |  482 +-
 doc/provisoire/entities.Courier.html          |  482 +-
 doc/provisoire/entities.Customer.html         |  482 +-
 doc/provisoire/entities.Manager.html          |  482 +-
 doc/provisoire/entities.Restaurant.html       |  482 +-
 doc/provisoire/entities.html                  |  552 +-
 doc/provisoire/package-frame.html             |   40 +-
 doc/provisoire/package-summary.html           |  284 +-
 doc/provisoire/package-tree.html              |  286 +-
 doc/provisoire/package-use.html               |  248 +-
 doc/script.js                                 |   60 +-
 doc/serialized-form.html                      |  359 +-
 doc/stylesheet.css                            | 1148 ++---
 doc/test/TestCard.html                        |  434 ++
 doc/test/TestCli.html                         |  312 ++
 doc/test/TestCore.html                        |  462 ++
 doc/test/TestCourier.html                     |  485 ++
 doc/test/TestCustomer.html                    |  480 ++
 doc/test/TestDeliveryStrategy.html            |  406 ++
 doc/test/TestException.html                   |  438 ++
 doc/test/TestItem.html                        |  358 ++
 doc/test/TestManager.html                     |  654 +++
 doc/test/TestOffers.html                      |  410 ++
 doc/test/TestOrder.html                       |  304 ++
 doc/test/TestOthers.html                      |  284 +
 doc/test/TestRestaurant.html                  |  508 ++
 doc/test/TestTargetProfitStrategy.html        |  420 ++
 doc/test/TestUserFactory.html                 |  402 ++
 doc/test/class-use/TestCard.html              |  124 +
 doc/test/class-use/TestCli.html               |  124 +
 doc/test/class-use/TestCore.html              |  124 +
 doc/test/class-use/TestCourier.html           |  124 +
 doc/test/class-use/TestCustomer.html          |  124 +
 doc/test/class-use/TestDeliveryStrategy.html  |  124 +
 doc/test/class-use/TestException.html         |  124 +
 doc/test/class-use/TestItem.html              |  124 +
 doc/test/class-use/TestManager.html           |  124 +
 doc/test/class-use/TestOffers.html            |  124 +
 doc/test/class-use/TestOrder.html             |  124 +
 doc/test/class-use/TestOthers.html            |  124 +
 doc/test/class-use/TestRestaurant.html        |  124 +
 .../class-use/TestTargetProfitStrategy.html   |  124 +
 doc/test/class-use/TestUserFactory.html       |  124 +
 doc/test/class-use/main.html                  |  248 +-
 doc/test/main.html                            |  542 +-
 doc/test/package-frame.html                   |   54 +-
 doc/test/package-summary.html                 |  340 +-
 doc/test/package-tree.html                    |  288 +-
 doc/test/package-use.html                     |  248 +-
 scenario/my_foodora.ini                       |  158 +-
 scenario/testScenario1.txt                    |  533 +-
 src/Cards/BasicFidelityCard.java              |    7 +
 src/Cards/FidelityCard.java                   |    8 +-
 src/Cards/LotteryFidelityCard.java            |    7 +
 src/Cards/PointFidelityCard.java              |    8 +
 src/Cli/Clui.java                             |  310 +-
 src/Cli/Command.java                          |   98 +-
 src/Cli/Confirm.java                          |   16 -
 src/Cli/Input.java                            |   33 +-
 src/Cli/Token.java                            |  120 +-
 src/Cli/errorWrongFormatValue.java            |   68 +-
 src/Cli/errorWrongNumberOfParams.java         |   68 +-
 src/Cli/errorWrongTypeOfUser.java             |   70 +-
 src/Commands/AddDishRestaurantMenu.java       |   77 +-
 src/Commands/AddDishToMeal.java               |   68 +-
 src/Commands/AddItemToOrder.java              |   74 +-
 src/Commands/AssociateCard.java               |   74 +-
 src/Commands/CreateMeal.java                  |   70 +-
 src/Commands/CreateOrder.java                 |   72 +-
 src/Commands/EndOrder.java                    |   63 +-
 src/Commands/EndOrderAt.java                  |   84 +-
 src/Commands/FindDeliverer.java               |   69 +-
 src/Commands/Help.java                        |  106 +-
 src/Commands/Login.java                       |   66 +-
 src/Commands/Logout.java                      |   58 +-
 src/Commands/OffDuty.java                     |   67 +-
 src/Commands/OnDuty.java                      |   70 +-
 src/Commands/RegisterCourier.java             |   85 +-
 src/Commands/RegisterCustomer.java            |   85 +-
 src/Commands/RegisterManager.java             |   84 +-
 src/Commands/RegisterRestaurant.java          |   83 +-
 src/Commands/RemoveSpecialOffer.java          |   64 +-
 src/Commands/RenameMeal.java                  |   68 +-
 src/Commands/RunTest.java                     |   83 +-
 src/Commands/SetDeliveryPolicy.java           |   67 +-
 src/Commands/SetProfitPolicy.java             |   71 +-
 src/Commands/SetSpecialOffer.java             |   64 +-
 src/Commands/ShowCourier.java                 |   69 +-
 src/Commands/ShowCourierOrdered.java          |   62 +-
 src/Commands/ShowCustomer.java                |   72 +-
 src/Commands/ShowMeal.java                    |   62 +-
 src/Commands/ShowMenuItem.java                |   69 +-
 src/Commands/ShowProfitBetween.java           |   72 +-
 src/Commands/ShowRestaurantTop.java           |  100 +-
 src/Commands/ShowTotalProfit.java             |   61 +-
 src/Commands/model.di                         |    2 -
 src/Commands/model.notation                   | 2276 ---------
 src/Commands/model.uml                        |  377 --
 src/Core/ActiveUserContext.java               |   45 +-
 src/Core/ContextStrategy.java                 |   16 +-
 src/Core/Main.java                            |  126 +-
 src/Core/MyFoodora.java                       |   19 +-
 .../ContextDeliveryStartegy.java              |   40 -
 .../ContextDeliveryStrategy.java              |  100 +-
 .../FairOccupationDelivery.java               |    7 +
 src/DeliveryStrategy/FastestDelivery.java     |    7 +
 .../StrategyDeliveryPolicy.java               |    7 +
 .../ExceptionUnknownStartegyType.java         |   70 +-
 src/Exception/ExceptionUnknownTypeOfUser.java |   76 +-
 src/Item/Dish.java                            |  134 +-
 src/Item/FactoryDish.java                     |   46 +-
 src/Item/FactoryMeal.java                     |    7 +
 src/Item/FullMeal.java                        |    7 +
 src/Item/HalfMeal.java                        |    7 +
 src/Item/Item.java                            |    7 +
 src/Item/Meal.java                            |  281 +-
 src/Item/MealFactory.java                     |    7 +
 src/Offers/BirthdayOffer.java                 |  126 +-
 src/Offers/MealOfTheWeek.java                 |  203 +-
 src/Offers/ObservableOffer.java               |   24 +-
 src/Offers/Observer.java                      |   14 +-
 src/Order/HistoricOrder.java                  |   69 +-
 src/Order/Order.java                          |  521 +-
 src/Others/Adress.java                        |    7 +
 src/Others/Date.java                          |    7 +
 src/Others/IDCard.java                        |    8 +
 src/Others/Period.java                        |   70 +-
 .../ContextTargetProfitStrategy.java          |  116 +-
 .../StrategyTargetProfitPolicy.java           |   51 +-
 .../TargetProfitDeliveryCost.java             |   59 +-
 src/StrategyProfit/TargetProfitMarkup.java    |   59 +-
 .../TargetProfitServiceFee.java               |   65 +-
 src/User/Courier.java                         |   19 +-
 src/User/Customer.java                        |   15 +-
 src/User/FactoryUserFactory.java              |   21 -
 src/User/HumanUser.java                       |    7 +
 src/User/HumanUserFactory.java                |   17 -
 src/User/IDUser.java                          |    7 +-
 src/User/ListUser.java                        |  106 +-
 src/User/Manager.java                         |   14 +-
 src/User/MoralUser.java                       |    9 +-
 src/User/MoralUserFactory.java                |   14 -
 src/User/Restaurant.java                      |   13 +-
 src/User/User.java                            |    8 +
 src/User/UserFactory.java                     |    6 -
 .../FactoryUserFactory.java                   |    8 +-
 src/UserFactoryPattern/HumanUserFactory.java  |    9 +-
 src/UserFactoryPattern/MoralUserFactory.java  |    8 +-
 src/UserFactoryPattern/UserFactory.java       |   13 +-
 src/model.di                                  |    4 +-
 src/model.notation                            | 4552 ++++++++---------
 src/model.uml                                 |  754 +--
 src/test/TestCard.java                        |  153 +-
 src/test/TestCli.java                         |   93 +-
 src/test/TestCore.java                        |  256 +-
 src/test/TestCourier.java                     |  228 +-
 src/test/TestCustomer.java                    |  211 +-
 src/test/TestDeliveryStrategy.java            |  135 +-
 src/test/TestException.java                   |  212 +-
 src/test/TestItem.java                        |  172 +-
 src/test/TestManager.java                     |  528 +-
 src/test/TestOffers.java                      |  159 +-
 src/test/TestOrder.java                       |  140 +-
 src/test/TestOthers.java                      |   54 +-
 src/test/TestRestaurant.java                  |  350 +-
 src/test/TestTargetProfitStrategy.java        |  290 +-
 src/test/TestUserFactory.java                 |   83 +-
 464 files changed, 87432 insertions(+), 56401 deletions(-)
 create mode 100644 doc/Cli/Command.html
 create mode 100644 doc/Cli/Token.TypeToken.html
 create mode 100644 doc/Cli/Token.html
 create mode 100644 doc/Cli/class-use/Command.html
 create mode 100644 doc/Cli/class-use/Token.TypeToken.html
 create mode 100644 doc/Cli/class-use/Token.html
 create mode 100644 doc/Cli/class-use/errorWrongFormatValue.html
 create mode 100644 doc/Cli/class-use/errorWrongNumberOfParams.html
 create mode 100644 doc/Cli/class-use/errorWrongTypeOfUser.html
 create mode 100644 doc/Cli/errorWrongFormatValue.html
 create mode 100644 doc/Cli/errorWrongNumberOfParams.html
 create mode 100644 doc/Cli/errorWrongTypeOfUser.html
 create mode 100644 doc/Commands/AddDishRestaurantMenu.html
 create mode 100644 doc/Commands/AddDishToMeal.html
 create mode 100644 doc/Commands/AddItemToOrder.html
 create mode 100644 doc/Commands/AssociateCard.html
 create mode 100644 doc/Commands/CreateMeal.html
 create mode 100644 doc/Commands/CreateOrder.html
 create mode 100644 doc/Commands/EndOrder.html
 create mode 100644 doc/Commands/EndOrderAt.html
 create mode 100644 doc/Commands/FindDeliverer.html
 create mode 100644 doc/Commands/Help.html
 create mode 100644 doc/Commands/Login.html
 create mode 100644 doc/Commands/Logout.html
 create mode 100644 doc/Commands/OffDuty.html
 create mode 100644 doc/Commands/OnDuty.html
 create mode 100644 doc/Commands/RegisterCourier.html
 create mode 100644 doc/Commands/RegisterCustomer.html
 create mode 100644 doc/Commands/RegisterManager.html
 create mode 100644 doc/Commands/RegisterRestaurant.html
 create mode 100644 doc/Commands/RemoveSpecialOffer.html
 create mode 100644 doc/Commands/RenameMeal.html
 create mode 100644 doc/Commands/RunTest.html
 create mode 100644 doc/Commands/SetDeliveryPolicy.html
 create mode 100644 doc/Commands/SetProfitPolicy.html
 create mode 100644 doc/Commands/SetSpecialOffer.html
 create mode 100644 doc/Commands/ShowCourier.html
 create mode 100644 doc/Commands/ShowCourierOrdered.html
 create mode 100644 doc/Commands/ShowCustomer.html
 create mode 100644 doc/Commands/ShowMeal.html
 create mode 100644 doc/Commands/ShowMenuItem.html
 create mode 100644 doc/Commands/ShowProfitBetween.html
 create mode 100644 doc/Commands/ShowRestaurantTop.html
 create mode 100644 doc/Commands/ShowTotalProfit.html
 create mode 100644 doc/Commands/class-use/AddDishRestaurantMenu.html
 create mode 100644 doc/Commands/class-use/AddDishToMeal.html
 create mode 100644 doc/Commands/class-use/AddItemToOrder.html
 create mode 100644 doc/Commands/class-use/AssociateCard.html
 create mode 100644 doc/Commands/class-use/CreateMeal.html
 create mode 100644 doc/Commands/class-use/CreateOrder.html
 create mode 100644 doc/Commands/class-use/EndOrder.html
 create mode 100644 doc/Commands/class-use/EndOrderAt.html
 create mode 100644 doc/Commands/class-use/FindDeliverer.html
 create mode 100644 doc/Commands/class-use/Help.html
 create mode 100644 doc/Commands/class-use/Login.html
 create mode 100644 doc/Commands/class-use/Logout.html
 create mode 100644 doc/Commands/class-use/OffDuty.html
 create mode 100644 doc/Commands/class-use/OnDuty.html
 create mode 100644 doc/Commands/class-use/RegisterCourier.html
 create mode 100644 doc/Commands/class-use/RegisterCustomer.html
 create mode 100644 doc/Commands/class-use/RegisterManager.html
 create mode 100644 doc/Commands/class-use/RegisterRestaurant.html
 create mode 100644 doc/Commands/class-use/RemoveSpecialOffer.html
 create mode 100644 doc/Commands/class-use/RenameMeal.html
 create mode 100644 doc/Commands/class-use/RunTest.html
 create mode 100644 doc/Commands/class-use/SetDeliveryPolicy.html
 create mode 100644 doc/Commands/class-use/SetProfitPolicy.html
 create mode 100644 doc/Commands/class-use/SetSpecialOffer.html
 create mode 100644 doc/Commands/class-use/ShowCourier.html
 create mode 100644 doc/Commands/class-use/ShowCourierOrdered.html
 create mode 100644 doc/Commands/class-use/ShowCustomer.html
 create mode 100644 doc/Commands/class-use/ShowMeal.html
 create mode 100644 doc/Commands/class-use/ShowMenuItem.html
 create mode 100644 doc/Commands/class-use/ShowProfitBetween.html
 create mode 100644 doc/Commands/class-use/ShowRestaurantTop.html
 create mode 100644 doc/Commands/class-use/ShowTotalProfit.html
 create mode 100644 doc/Commands/package-frame.html
 create mode 100644 doc/Commands/package-summary.html
 create mode 100644 doc/Commands/package-tree.html
 create mode 100644 doc/Commands/package-use.html
 create mode 100644 doc/Core/Main.html
 create mode 100644 doc/Core/class-use/Main.html
 create mode 100644 doc/Exception/ExceptionUnknownTypeOfUser.html
 create mode 100644 doc/Exception/class-use/ExceptionUnknownTypeOfUser.html
 create mode 100644 doc/Offers/BirthdayOffer.html
 create mode 100644 doc/Offers/class-use/BirthdayOffer.html
 create mode 100644 doc/Others/Historique.html
 create mode 100644 doc/Others/class-use/Historique.html
 create mode 100644 doc/User/UserFactory.html
 create mode 100644 doc/User/class-use/UserFactory.html
 create mode 100644 doc/test/TestCard.html
 create mode 100644 doc/test/TestCli.html
 create mode 100644 doc/test/TestCore.html
 create mode 100644 doc/test/TestCourier.html
 create mode 100644 doc/test/TestCustomer.html
 create mode 100644 doc/test/TestDeliveryStrategy.html
 create mode 100644 doc/test/TestException.html
 create mode 100644 doc/test/TestItem.html
 create mode 100644 doc/test/TestManager.html
 create mode 100644 doc/test/TestOffers.html
 create mode 100644 doc/test/TestOrder.html
 create mode 100644 doc/test/TestOthers.html
 create mode 100644 doc/test/TestRestaurant.html
 create mode 100644 doc/test/TestTargetProfitStrategy.html
 create mode 100644 doc/test/TestUserFactory.html
 create mode 100644 doc/test/class-use/TestCard.html
 create mode 100644 doc/test/class-use/TestCli.html
 create mode 100644 doc/test/class-use/TestCore.html
 create mode 100644 doc/test/class-use/TestCourier.html
 create mode 100644 doc/test/class-use/TestCustomer.html
 create mode 100644 doc/test/class-use/TestDeliveryStrategy.html
 create mode 100644 doc/test/class-use/TestException.html
 create mode 100644 doc/test/class-use/TestItem.html
 create mode 100644 doc/test/class-use/TestManager.html
 create mode 100644 doc/test/class-use/TestOffers.html
 create mode 100644 doc/test/class-use/TestOrder.html
 create mode 100644 doc/test/class-use/TestOthers.html
 create mode 100644 doc/test/class-use/TestRestaurant.html
 create mode 100644 doc/test/class-use/TestTargetProfitStrategy.html
 create mode 100644 doc/test/class-use/TestUserFactory.html
 delete mode 100644 src/Cli/Confirm.java
 delete mode 100644 src/Commands/model.di
 delete mode 100644 src/Commands/model.notation
 delete mode 100644 src/Commands/model.uml
 delete mode 100644 src/DeliveryStrategy/ContextDeliveryStartegy.java
 delete mode 100644 src/User/FactoryUserFactory.java
 delete mode 100644 src/User/HumanUserFactory.java
 delete mode 100644 src/User/MoralUserFactory.java

diff --git a/.gitignore b/.gitignore
index 239de2d..60f78bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/bin/
-/src/provisoire/
-/rapport/
-.*
+/bin/
+/src/provisoire/
+/rapport/
+.*
 !.gitignore
\ No newline at end of file
diff --git a/Period.java b/Period.java
index f37f18b..b24ca9d 100644
--- a/Period.java
+++ b/Period.java
@@ -1,56 +1,56 @@
-package Others;
-
-import java.util.ArrayList;
-
-import Order.HistoricOrder;
-import Order.Order;
-
-public class Period {
-	private Date beginingOfPeriod, endOfPeriod;
-
-	public Period(Date beginingOfPeriod, Date endOfPeriod) {
-		super();
-		this.beginingOfPeriod = beginingOfPeriod;
-		this.endOfPeriod = endOfPeriod;
-	}
-
-	public Date getBeginingOfPeriod() {
-		return beginingOfPeriod;
-	}
-
-	public void setBeginingOfPeriod(Date beginingOfPeriod) {
-		this.beginingOfPeriod = beginingOfPeriod;
-	}
-
-	public Date getEndOfPeriod() {
-		return endOfPeriod;
-	}
-
-	public void setEndOfPeriod(Date endOfPeriod) {
-		this.endOfPeriod = endOfPeriod;
-	}
-	
-	public ArrayList<Order> getListOfOrderInAPeriod(HistoricOrder historic, Period period){
-		ArrayList<Order> listOrder = new ArrayList<Order>();
-		int beginDay = period.getBeginingOfPeriod().getIntDay();
-		int endDay = period.getEndOfPeriod().getIntDay();
-		int beginMonth = period.getBeginingOfPeriod().getIntMonth();
-		int endMonth = period.getEndOfPeriod().getIntMonth();
-		int beginYear = period.getBeginingOfPeriod().getIntYear();
-		int endYear = period.getEndOfPeriod().getIntYear();
-		for (Order order : historic.getListOrder()){
-			Date dateOfOrder = order.getDate();
-			int dayOfOrder = dateOfOrder.getIntDay();
-			int monthOfOrder = dateOfOrder.getIntMonth()();
-			int yearOfOrder = dateOfOrder.getIntYear()();
-			if((beginYear< yearOfOrder) & ()){
-				
-			}
-		}
-		
-		return null;
-		
-		
-	}
-
-}
+package Others;
+
+import java.util.ArrayList;
+
+import Order.HistoricOrder;
+import Order.Order;
+
+public class Period {
+	private Date beginingOfPeriod, endOfPeriod;
+
+	public Period(Date beginingOfPeriod, Date endOfPeriod) {
+		super();
+		this.beginingOfPeriod = beginingOfPeriod;
+		this.endOfPeriod = endOfPeriod;
+	}
+
+	public Date getBeginingOfPeriod() {
+		return beginingOfPeriod;
+	}
+
+	public void setBeginingOfPeriod(Date beginingOfPeriod) {
+		this.beginingOfPeriod = beginingOfPeriod;
+	}
+
+	public Date getEndOfPeriod() {
+		return endOfPeriod;
+	}
+
+	public void setEndOfPeriod(Date endOfPeriod) {
+		this.endOfPeriod = endOfPeriod;
+	}
+	
+	public ArrayList<Order> getListOfOrderInAPeriod(HistoricOrder historic, Period period){
+		ArrayList<Order> listOrder = new ArrayList<Order>();
+		int beginDay = period.getBeginingOfPeriod().getIntDay();
+		int endDay = period.getEndOfPeriod().getIntDay();
+		int beginMonth = period.getBeginingOfPeriod().getIntMonth();
+		int endMonth = period.getEndOfPeriod().getIntMonth();
+		int beginYear = period.getBeginingOfPeriod().getIntYear();
+		int endYear = period.getEndOfPeriod().getIntYear();
+		for (Order order : historic.getListOrder()){
+			Date dateOfOrder = order.getDate();
+			int dayOfOrder = dateOfOrder.getIntDay();
+			int monthOfOrder = dateOfOrder.getIntMonth()();
+			int yearOfOrder = dateOfOrder.getIntYear()();
+			if((beginYear< yearOfOrder) & ()){
+				
+			}
+		}
+		
+		return null;
+		
+		
+	}
+
+}
diff --git a/doc/Cards/BasicFidelityCard.html b/doc/Cards/BasicFidelityCard.html
index 66ae58e..c98b9aa 100644
--- a/doc/Cards/BasicFidelityCard.html
+++ b/doc/Cards/BasicFidelityCard.html
@@ -1,309 +1,348 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>BasicFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="BasicFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/BasicFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/BasicFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Class BasicFidelityCard" class="title">Class BasicFidelityCard</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
-<li>
-<ul class="inheritance">
-<li>Cards.BasicFidelityCard</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">BasicFidelityCard</span>
-extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
-implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#BasicFidelityCard--">BasicFidelityCard</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#accept--">accept</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
-<code><a href="../Cards/FidelityCard.html#getId--">getId</a>, <a href="../Cards/FidelityCard.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="BasicFidelityCard--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>BasicFidelityCard</h4>
-<pre>public&nbsp;BasicFidelityCard()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="returnType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>returnType</h4>
-<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="accept--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>accept</h4>
-<pre>public&nbsp;long&nbsp;accept()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/VisitableCard.html#accept--">accept</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/BasicFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/BasicFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>BasicFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="BasicFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BasicFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/BasicFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Class BasicFidelityCard" class="title">Class BasicFidelityCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
+<li>
+<ul class="inheritance">
+<li>Cards.BasicFidelityCard</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">BasicFidelityCard</span>
+extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
+implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
+<div class="block">Basic Card, by default attached to the client, no point, no lottery.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#BasicFidelityCard--">BasicFidelityCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#acceptPercentage--">acceptPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#acceptPoint--">acceptPoint</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
+<code><a href="../Cards/FidelityCard.html#getId--">getId</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="BasicFidelityCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>BasicFidelityCard</h4>
+<pre>public&nbsp;BasicFidelityCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="returnType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>returnType</h4>
+<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="acceptPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPoint</h4>
+<pre>public&nbsp;long&nbsp;acceptPoint()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="acceptPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPercentage</h4>
+<pre>public&nbsp;double&nbsp;acceptPercentage()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BasicFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/BasicFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/FidelityCard.html b/doc/Cards/FidelityCard.html
index 1e4fc69..adb38ed 100644
--- a/doc/Cards/FidelityCard.html
+++ b/doc/Cards/FidelityCard.html
@@ -1,317 +1,322 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>FidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":6,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/FidelityCard.html" target="_top">Frames</a></li>
-<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Class FidelityCard" class="title">Class FidelityCard</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Cards.FidelityCard</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a>, <a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>, <a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">FidelityCard</span>
-extends java.lang.Object
-implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#FidelityCard--">FidelityCard</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#getId--">getId</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>abstract java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Cards.VisitableCard">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></h3>
-<code><a href="../Cards/VisitableCard.html#accept--">accept</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FidelityCard--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FidelityCard</h4>
-<pre>public&nbsp;FidelityCard()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getId--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getId</h4>
-<pre>public&nbsp;long&nbsp;getId()</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="returnType--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>returnType</h4>
-<pre>public abstract&nbsp;java.lang.String&nbsp;returnType()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/FidelityCard.html" target="_top">Frames</a></li>
-<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>FidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":6,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/FidelityCard.html" target="_top">Frames</a></li>
+<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Class FidelityCard" class="title">Class FidelityCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cards.FidelityCard</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a>, <a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>, <a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">FidelityCard</span>
+extends java.lang.Object
+implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
+<div class="block">FidelityCard abstract class.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#FidelityCard--">FidelityCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#getId--">getId</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/FidelityCard.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cards.VisitableCard">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></h3>
+<code><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage</a>, <a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FidelityCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FidelityCard</h4>
+<pre>public&nbsp;FidelityCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getId--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getId</h4>
+<pre>public&nbsp;long&nbsp;getId()</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="returnType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>returnType</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;returnType()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/FidelityCard.html" target="_top">Frames</a></li>
+<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/LotteryFidelityCard.html b/doc/Cards/LotteryFidelityCard.html
index d4acc36..6d79fbb 100644
--- a/doc/Cards/LotteryFidelityCard.html
+++ b/doc/Cards/LotteryFidelityCard.html
@@ -1,322 +1,387 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>LotteryFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LotteryFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/LotteryFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/LotteryFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Class LotteryFidelityCard" class="title">Class LotteryFidelityCard</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
-<li>
-<ul class="inheritance">
-<li>Cards.LotteryFidelityCard</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">LotteryFidelityCard</span>
-extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
-implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#LotteryFidelityCard-double-">LotteryFidelityCard</a></span>(double&nbsp;percentage)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#accept--">accept</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#setPercentage-double-">setPercentage</a></span>(double&nbsp;percentage)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
-<code><a href="../Cards/FidelityCard.html#getId--">getId</a>, <a href="../Cards/FidelityCard.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="LotteryFidelityCard-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>LotteryFidelityCard</h4>
-<pre>public&nbsp;LotteryFidelityCard(double&nbsp;percentage)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="returnType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>returnType</h4>
-<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="accept--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>accept</h4>
-<pre>public&nbsp;long&nbsp;accept()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/VisitableCard.html#accept--">accept</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="setPercentage-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setPercentage</h4>
-<pre>public&nbsp;void&nbsp;setPercentage(double&nbsp;percentage)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/LotteryFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/LotteryFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>LotteryFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="LotteryFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/LotteryFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/LotteryFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Class LotteryFidelityCard" class="title">Class LotteryFidelityCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
+<li>
+<ul class="inheritance">
+<li>Cards.LotteryFidelityCard</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">LotteryFidelityCard</span>
+extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
+implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#LotteryFidelityCard--">LotteryFidelityCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#acceptPercentage--">acceptPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#acceptPoint--">acceptPoint</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#getPercentage--">getPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#getReduction--">getReduction</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#setPercentage-double-">setPercentage</a></span>(double&nbsp;percentage)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
+<code><a href="../Cards/FidelityCard.html#getId--">getId</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="LotteryFidelityCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LotteryFidelityCard</h4>
+<pre>public&nbsp;LotteryFidelityCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="returnType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>returnType</h4>
+<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getReduction--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReduction</h4>
+<pre>public&nbsp;boolean&nbsp;getReduction()</pre>
+</li>
+</ul>
+<a name="getPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPercentage</h4>
+<pre>public&nbsp;double&nbsp;getPercentage()</pre>
+</li>
+</ul>
+<a name="setPercentage-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPercentage</h4>
+<pre>public&nbsp;void&nbsp;setPercentage(double&nbsp;percentage)</pre>
+</li>
+</ul>
+<a name="acceptPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPoint</h4>
+<pre>public&nbsp;long&nbsp;acceptPoint()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="acceptPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPercentage</h4>
+<pre>public&nbsp;double&nbsp;acceptPercentage()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/LotteryFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/LotteryFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/PointFidelityCard.html b/doc/Cards/PointFidelityCard.html
index 87db894..b3515a9 100644
--- a/doc/Cards/PointFidelityCard.html
+++ b/doc/Cards/PointFidelityCard.html
@@ -1,309 +1,374 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>PointFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PointFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/PointFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/PointFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Class PointFidelityCard" class="title">Class PointFidelityCard</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
-<li>
-<ul class="inheritance">
-<li>Cards.PointFidelityCard</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">PointFidelityCard</span>
-extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
-implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#PointFidelityCard--">PointFidelityCard</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#accept--">accept</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
-<code><a href="../Cards/FidelityCard.html#getId--">getId</a>, <a href="../Cards/FidelityCard.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="PointFidelityCard--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>PointFidelityCard</h4>
-<pre>public&nbsp;PointFidelityCard()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="returnType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>returnType</h4>
-<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="accept--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>accept</h4>
-<pre>public&nbsp;long&nbsp;accept()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/VisitableCard.html#accept--">accept</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/PointFidelityCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/PointFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>PointFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PointFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/PointFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/PointFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Class PointFidelityCard" class="title">Class PointFidelityCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cards/FidelityCard.html" title="class in Cards">Cards.FidelityCard</a></li>
+<li>
+<ul class="inheritance">
+<li>Cards.PointFidelityCard</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PointFidelityCard</span>
+extends <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>
+implements <a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></pre>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#PointFidelityCard--">PointFidelityCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#acceptPercentage--">acceptPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#acceptPoint--">acceptPoint</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#getNbOfPoint--">getNbOfPoint</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#returnType--">returnType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#setNbOfPoint-long-">setNbOfPoint</a></span>(long&nbsp;nbOfPoint)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cards.FidelityCard">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></h3>
+<code><a href="../Cards/FidelityCard.html#getId--">getId</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="PointFidelityCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PointFidelityCard</h4>
+<pre>public&nbsp;PointFidelityCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="returnType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>returnType</h4>
+<pre>public&nbsp;java.lang.String&nbsp;returnType()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#returnType--">returnType</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="acceptPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPoint</h4>
+<pre>public&nbsp;long&nbsp;acceptPoint()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNbOfPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNbOfPoint</h4>
+<pre>public&nbsp;long&nbsp;getNbOfPoint()</pre>
+</li>
+</ul>
+<a name="setNbOfPoint-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNbOfPoint</h4>
+<pre>public&nbsp;void&nbsp;setNbOfPoint(long&nbsp;nbOfPoint)</pre>
+</li>
+</ul>
+<a name="acceptPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPercentage</h4>
+<pre>public&nbsp;double&nbsp;acceptPercentage()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../Cards/FidelityCard.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/PointFidelityCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/PointFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/VisitableCard.html b/doc/Cards/VisitableCard.html
index ab35556..96d2950 100644
--- a/doc/Cards/VisitableCard.html
+++ b/doc/Cards/VisitableCard.html
@@ -1,225 +1,238 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>VisitableCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VisitableCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitableCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/VisitableCard.html" target="_top">Frames</a></li>
-<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Interface VisitableCard" class="title">Interface VisitableCard</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a>, <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>, <a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>, <a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">VisitableCard</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisitableCard.html#accept--">accept</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="accept--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>accept</h4>
-<pre>long&nbsp;accept()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitableCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/VisitableCard.html" target="_top">Frames</a></li>
-<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>VisitableCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="VisitableCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitableCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/VisitableCard.html" target="_top">Frames</a></li>
+<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Interface VisitableCard" class="title">Interface VisitableCard</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a>, <a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>, <a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>, <a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">VisitableCard</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="acceptPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptPoint</h4>
+<pre>long&nbsp;acceptPoint()</pre>
+</li>
+</ul>
+<a name="acceptPercentage--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>acceptPercentage</h4>
+<pre>double&nbsp;acceptPercentage()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitableCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/VisitableCard.html" target="_top">Frames</a></li>
+<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/VisiterCard.html b/doc/Cards/VisiterCard.html
index f243b49..7d28304 100644
--- a/doc/Cards/VisiterCard.html
+++ b/doc/Cards/VisiterCard.html
@@ -1,225 +1,238 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>VisiterCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VisiterCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisiterCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/VisiterCard.html" target="_top">Frames</a></li>
-<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cards</div>
-<h2 title="Interface VisiterCard" class="title">Interface VisiterCard</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../User/Customer.html" title="class in User">Customer</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">VisiterCard</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.VisitableCard-">visit</a></span>(<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="visit-Cards.VisitableCard-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>visit</h4>
-<pre>long&nbsp;visit(<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisiterCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/VisiterCard.html" target="_top">Frames</a></li>
-<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>VisiterCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="VisiterCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisiterCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/VisiterCard.html" target="_top">Frames</a></li>
+<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cards</div>
+<h2 title="Interface VisiterCard" class="title">Interface VisiterCard</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../User/Customer.html" title="class in User">Customer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">VisiterCard</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.LotteryFidelityCard-">visit</a></span>(<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.PointFidelityCard-">visit</a></span>(<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="visit-Cards.PointFidelityCard-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>visit</h4>
+<pre>long&nbsp;visit(<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</pre>
+</li>
+</ul>
+<a name="visit-Cards.LotteryFidelityCard-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>visit</h4>
+<pre>double&nbsp;visit(<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisiterCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/VisiterCard.html" target="_top">Frames</a></li>
+<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/BasicFidelityCard.html b/doc/Cards/class-use/BasicFidelityCard.html
index 670560f..748b0cc 100644
--- a/doc/Cards/class-use/BasicFidelityCard.html
+++ b/doc/Cards/class-use/BasicFidelityCard.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cards.BasicFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cards.BasicFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/BasicFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cards.BasicFidelityCard" class="title">Uses of Class<br>Cards.BasicFidelityCard</h2>
-</div>
-<div class="classUseContainer">No usage of Cards.BasicFidelityCard</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/BasicFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cards.BasicFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cards.BasicFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/BasicFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cards.BasicFidelityCard" class="title">Uses of Class<br>Cards.BasicFidelityCard</h2>
+</div>
+<div class="classUseContainer">No usage of Cards.BasicFidelityCard</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/BasicFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="BasicFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/FidelityCard.html b/doc/Cards/class-use/FidelityCard.html
index 75fbc28..7347d1e 100644
--- a/doc/Cards/class-use/FidelityCard.html
+++ b/doc/Cards/class-use/FidelityCard.html
@@ -1,208 +1,214 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cards.FidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cards.FidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/FidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/FidelityCard.html" target="_top">Frames</a></li>
-<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cards.FidelityCard" class="title">Uses of Class<br>Cards.FidelityCard</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Cards">Cards</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Cards">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getCard--">getCard</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard</a></span>(<a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
-                          double&nbsp;percentage)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/FidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/FidelityCard.html" target="_top">Frames</a></li>
-<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cards.FidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cards.FidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/FidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/FidelityCard.html" target="_top">Frames</a></li>
+<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cards.FidelityCard" class="title">Uses of Class<br>Cards.FidelityCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cards">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cards">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></span></code>
+<div class="block">Basic Card, by default attached to the client, no point, no lottery.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span></code>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span></code>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getCard--">getCard</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard</a></span>(<a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
+                          double&nbsp;percentage)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/FidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/FidelityCard.html" target="_top">Frames</a></li>
+<li><a href="FidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/LotteryFidelityCard.html b/doc/Cards/class-use/LotteryFidelityCard.html
index d72fd9e..2c1af6f 100644
--- a/doc/Cards/class-use/LotteryFidelityCard.html
+++ b/doc/Cards/class-use/LotteryFidelityCard.html
@@ -1,124 +1,186 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cards.LotteryFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cards.LotteryFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/LotteryFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cards.LotteryFidelityCard" class="title">Uses of Class<br>Cards.LotteryFidelityCard</h2>
-</div>
-<div class="classUseContainer">No usage of Cards.LotteryFidelityCard</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/LotteryFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cards.LotteryFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cards.LotteryFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/LotteryFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cards.LotteryFidelityCard" class="title">Uses of Class<br>Cards.LotteryFidelityCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cards">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cards">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cards/package-summary.html">Cards</a> with parameters of type <a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">VisiterCard.</span><code><span class="memberNameLink"><a href="../../Cards/VisiterCard.html#visit-Cards.LotteryFidelityCard-">visit</a></span>(<a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#visit-Cards.LotteryFidelityCard-">visit</a></span>(<a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/LotteryFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="LotteryFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/PointFidelityCard.html b/doc/Cards/class-use/PointFidelityCard.html
index 283ba3e..541b6c8 100644
--- a/doc/Cards/class-use/PointFidelityCard.html
+++ b/doc/Cards/class-use/PointFidelityCard.html
@@ -1,124 +1,186 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cards.PointFidelityCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cards.PointFidelityCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/PointFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/PointFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cards.PointFidelityCard" class="title">Uses of Class<br>Cards.PointFidelityCard</h2>
-</div>
-<div class="classUseContainer">No usage of Cards.PointFidelityCard</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/PointFidelityCard.html" title="class in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/PointFidelityCard.html" target="_top">Frames</a></li>
-<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cards.PointFidelityCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cards.PointFidelityCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/PointFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/PointFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cards.PointFidelityCard" class="title">Uses of Class<br>Cards.PointFidelityCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cards">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cards">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cards/package-summary.html">Cards</a> with parameters of type <a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><span class="typeNameLabel">VisiterCard.</span><code><span class="memberNameLink"><a href="../../Cards/VisiterCard.html#visit-Cards.PointFidelityCard-">visit</a></span>(<a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#visit-Cards.PointFidelityCard-">visit</a></span>(<a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/PointFidelityCard.html" title="class in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/PointFidelityCard.html" target="_top">Frames</a></li>
+<li><a href="PointFidelityCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/VisitableCard.html b/doc/Cards/class-use/VisitableCard.html
index 1f885ce..7191423 100644
--- a/doc/Cards/class-use/VisitableCard.html
+++ b/doc/Cards/class-use/VisitableCard.html
@@ -1,211 +1,184 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Cards.VisitableCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Cards.VisitableCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/VisitableCard.html" title="interface in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/VisitableCard.html" target="_top">Frames</a></li>
-<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Cards.VisitableCard" class="title">Uses of Interface<br>Cards.VisitableCard</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Cards">Cards</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Cards">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../Cards/package-summary.html">Cards</a> that implement <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Cards/package-summary.html">Cards</a> with parameters of type <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="typeNameLabel">VisiterCard.</span><code><span class="memberNameLink"><a href="../../Cards/VisiterCard.html#visit-Cards.VisitableCard-">visit</a></span>(<a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#visit-Cards.VisitableCard-">visit</a></span>(<a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/VisitableCard.html" title="interface in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/VisitableCard.html" target="_top">Frames</a></li>
-<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Interface Cards.VisitableCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Cards.VisitableCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/VisitableCard.html" title="interface in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/VisitableCard.html" target="_top">Frames</a></li>
+<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Cards.VisitableCard" class="title">Uses of Interface<br>Cards.VisitableCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cards">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cards">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a> in <a href="../../Cards/package-summary.html">Cards</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../Cards/package-summary.html">Cards</a> that implement <a href="../../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></span></code>
+<div class="block">Basic Card, by default attached to the client, no point, no lottery.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></span></code>
+<div class="block">FidelityCard abstract class.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></span></code>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></span></code>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/VisitableCard.html" title="interface in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/VisitableCard.html" target="_top">Frames</a></li>
+<li><a href="VisitableCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/class-use/VisiterCard.html b/doc/Cards/class-use/VisiterCard.html
index e665123..58366d2 100644
--- a/doc/Cards/class-use/VisiterCard.html
+++ b/doc/Cards/class-use/VisiterCard.html
@@ -1,164 +1,166 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Cards.VisiterCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Cards.VisiterCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/VisiterCard.html" title="interface in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/VisiterCard.html" target="_top">Frames</a></li>
-<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Cards.VisiterCard" class="title">Uses of Interface<br>Cards.VisiterCard</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../User/package-summary.html">User</a> that implement <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cards/VisiterCard.html" title="interface in Cards">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cards/class-use/VisiterCard.html" target="_top">Frames</a></li>
-<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Interface Cards.VisiterCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Cards.VisiterCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/VisiterCard.html" title="interface in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/VisiterCard.html" target="_top">Frames</a></li>
+<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Cards.VisiterCard" class="title">Uses of Interface<br>Cards.VisiterCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../User/package-summary.html">User</a> that implement <a href="../../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cards/VisiterCard.html" title="interface in Cards">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cards/class-use/VisiterCard.html" target="_top">Frames</a></li>
+<li><a href="VisiterCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/package-frame.html b/doc/Cards/package-frame.html
index 3e44198..7ab1cd1 100644
--- a/doc/Cards/package-frame.html
+++ b/doc/Cards/package-frame.html
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cards</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Cards/package-summary.html" target="classFrame">Cards</a></h1>
-<div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="VisitableCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisitableCard</span></a></li>
-<li><a href="VisiterCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisiterCard</span></a></li>
-</ul>
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="BasicFidelityCard.html" title="class in Cards" target="classFrame">BasicFidelityCard</a></li>
-<li><a href="FidelityCard.html" title="class in Cards" target="classFrame">FidelityCard</a></li>
-<li><a href="LotteryFidelityCard.html" title="class in Cards" target="classFrame">LotteryFidelityCard</a></li>
-<li><a href="PointFidelityCard.html" title="class in Cards" target="classFrame">PointFidelityCard</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cards</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Cards/package-summary.html" target="classFrame">Cards</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="VisitableCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisitableCard</span></a></li>
+<li><a href="VisiterCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisiterCard</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="BasicFidelityCard.html" title="class in Cards" target="classFrame">BasicFidelityCard</a></li>
+<li><a href="FidelityCard.html" title="class in Cards" target="classFrame">FidelityCard</a></li>
+<li><a href="LotteryFidelityCard.html" title="class in Cards" target="classFrame">LotteryFidelityCard</a></li>
+<li><a href="PointFidelityCard.html" title="class in Cards" target="classFrame">PointFidelityCard</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Cards/package-summary.html b/doc/Cards/package-summary.html
index be0d2fc..de8cca1 100644
--- a/doc/Cards/package-summary.html
+++ b/doc/Cards/package-summary.html
@@ -1,173 +1,181 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cards</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Cards";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Package</li>
-<li><a href="../Cli/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Cards</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Package</li>
-<li><a href="../Cli/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cards</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Cards";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li><a href="../Cli/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Cards</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></td>
+<td class="colLast">
+<div class="block">Basic Card, by default attached to the client, no point, no lottery.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></td>
+<td class="colLast">
+<div class="block">FidelityCard abstract class.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></td>
+<td class="colLast">
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></td>
+<td class="colLast">
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Package</li>
+<li><a href="../Cli/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/package-tree.html b/doc/Cards/package-tree.html
index c0a80b8..19e8e71 100644
--- a/doc/Cards/package-tree.html
+++ b/doc/Cards/package-tree.html
@@ -1,148 +1,148 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cards Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Cards Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li><a href="../Cli/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Cards</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Cards.<a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)
-<ul>
-<li type="circle">Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-<li type="circle">Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-<li type="circle">Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a></li>
-<li type="circle">Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li><a href="../Cli/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cards Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Cards Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li><a href="../Cli/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Cards</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Cards.<a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)
+<ul>
+<li type="circle">Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+<li type="circle">Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+<li type="circle">Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> (implements Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a></li>
+<li type="circle">Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li><a href="../Cli/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cards/package-use.html b/doc/Cards/package-use.html
index a2f933d..fc6b037 100644
--- a/doc/Cards/package-use.html
+++ b/doc/Cards/package-use.html
@@ -1,185 +1,206 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Cards</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Cards";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Cards" class="title">Uses of Package<br>Cards</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Cards">Cards</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Cards">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Cards/package-summary.html">Cards</a> used by <a href="../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Cards/class-use/FidelityCard.html#Cards">FidelityCard</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Cards/class-use/VisitableCard.html#Cards">VisitableCard</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Cards/package-summary.html">Cards</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Cards/class-use/FidelityCard.html#User">FidelityCard</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Cards/class-use/VisitableCard.html#User">VisitableCard</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Cards/class-use/VisiterCard.html#User">VisiterCard</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cards/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Cards</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Cards";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Cards" class="title">Uses of Package<br>Cards</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cards">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Cards">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Cards/package-summary.html">Cards</a> used by <a href="../Cards/package-summary.html">Cards</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Cards/class-use/FidelityCard.html#Cards">FidelityCard</a>
+<div class="block">FidelityCard abstract class.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cards/class-use/LotteryFidelityCard.html#Cards">LotteryFidelityCard</a>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Cards/class-use/PointFidelityCard.html#Cards">PointFidelityCard</a>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cards/class-use/VisitableCard.html#Cards">VisitableCard</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Cards/package-summary.html">Cards</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Cards/class-use/FidelityCard.html#User">FidelityCard</a>
+<div class="block">FidelityCard abstract class.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cards/class-use/LotteryFidelityCard.html#User">LotteryFidelityCard</a>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Cards/class-use/PointFidelityCard.html#User">PointFidelityCard</a>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cards/class-use/VisiterCard.html#User">VisiterCard</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cards/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Clui.html b/doc/Cli/Clui.html
index 23b6622..d75d556 100644
--- a/doc/Cli/Clui.html
+++ b/doc/Cli/Clui.html
@@ -1,271 +1,305 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Clui</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Clui";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Clui.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Clui.html" target="_top">Frames</a></li>
-<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cli</div>
-<h2 title="Class Clui" class="title">Class Clui</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Cli.Clui</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Clui</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Clui.html#Clui--">Clui</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Clui.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Clui--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Clui</h4>
-<pre>public&nbsp;Clui()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="main-java.lang.String:A-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Clui.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Clui.html" target="_top">Frames</a></li>
-<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Clui</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Clui";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Clui.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Clui.html" target="_top">Frames</a></li>
+<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class Clui" class="title">Class Clui</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Clui</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Clui</span>
+extends java.lang.Object</pre>
+<div class="block">Clui controller, create a context allowing cli into foodora system.
+ Each command is parsed, arguments are verified through regex and the number of argument.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Clui.html#Clui-Core.MyFoodora-Core.ActiveUserContext-">Clui</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;_foodora,
+    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;_activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Clui.html#executeCommand-java.lang.String-">executeCommand</a></span>(java.lang.String&nbsp;command)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Clui.html#getCommand-java.lang.String-">getCommand</a></span>(java.lang.String&nbsp;commandName)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Clui.html#launchClui--">launchClui</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Clui-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Clui</h4>
+<pre>public&nbsp;Clui(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;_foodora,
+            <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;_activeUser)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getCommand-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCommand</h4>
+<pre>public&nbsp;<a href="../Cli/Command.html" title="class in Cli">Command</a>&nbsp;getCommand(java.lang.String&nbsp;commandName)</pre>
+</li>
+</ul>
+<a name="executeCommand-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeCommand</h4>
+<pre>public&nbsp;void&nbsp;executeCommand(java.lang.String&nbsp;command)</pre>
+</li>
+</ul>
+<a name="launchClui--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>launchClui</h4>
+<pre>public&nbsp;void&nbsp;launchClui()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Clui.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Clui.html" target="_top">Frames</a></li>
+<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Command.html b/doc/Cli/Command.html
new file mode 100644
index 0000000..4d7db84
--- /dev/null
+++ b/doc/Cli/Command.html
@@ -0,0 +1,335 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Command</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Command";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Command.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class Command" class="title">Class Command</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Command</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a>, <a href="../Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a>, <a href="../Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a>, <a href="../Commands/AssociateCard.html" title="class in Commands">AssociateCard</a>, <a href="../Commands/CreateMeal.html" title="class in Commands">CreateMeal</a>, <a href="../Commands/CreateOrder.html" title="class in Commands">CreateOrder</a>, <a href="../Commands/EndOrder.html" title="class in Commands">EndOrder</a>, <a href="../Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a>, <a href="../Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a>, <a href="../Commands/Help.html" title="class in Commands">Help</a>, <a href="../Commands/Login.html" title="class in Commands">Login</a>, <a href="../Commands/Logout.html" title="class in Commands">Logout</a>, <a href="../Commands/OffDuty.html" title="class in Commands">OffDuty</a>, <a href="../Commands/OnDuty.html" title="class in Commands">OnDuty</a>, <a href="../Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a>, <a href="../Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a>, <a href="../Commands/RegisterManager.html" title="class in Commands">RegisterManager</a>, <a href="../Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a>, <a href="../Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a>, <a href="../Commands/RenameMeal.html" title="class in Commands">RenameMeal</a>, <a href="../Commands/RunTest.html" title="class in Commands">RunTest</a>, <a href="../Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a>, <a href="../Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a>, <a href="../Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a>, <a href="../Commands/ShowCourier.html" title="class in Commands">ShowCourier</a>, <a href="../Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a>, <a href="../Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a>, <a href="../Commands/ShowMeal.html" title="class in Commands">ShowMeal</a>, <a href="../Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a>, <a href="../Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a>, <a href="../Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a>, <a href="../Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">Command</span>
+extends java.lang.Object</pre>
+<div class="block">Describes how all command are, composed by a commandName and a listOfArgs,
+ It allow to verify if each argument is correct, and if all arguments are there.
+ Commands execute should verify if the user is connected and have the good instance value
+  by using the ActiveUserContext variable.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Command.html#Command-java.lang.String-Cli.Token:A-">Command</a></span>(java.lang.String&nbsp;_commandName,
+       <a href="../Cli/Token.html" title="class in Cli">Token</a>[]&nbsp;_listOfArgs)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></span>(java.lang.String&nbsp;firstToken)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Command-java.lang.String-Cli.Token:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Command</h4>
+<pre>public&nbsp;Command(java.lang.String&nbsp;_commandName,
+               <a href="../Cli/Token.html" title="class in Cli">Token</a>[]&nbsp;_listOfArgs)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="isOneWanted-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOneWanted</h4>
+<pre>public&nbsp;boolean&nbsp;isOneWanted(java.lang.String&nbsp;firstToken)</pre>
+</li>
+</ul>
+<a name="isGoodArgument-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isGoodArgument</h4>
+<pre>public&nbsp;boolean&nbsp;isGoodArgument(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments)
+                       throws <a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a>,
+                              <a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></code></dd>
+<dd><code><a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public abstract&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                             <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+                      throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                             java.lang.NumberFormatException,
+                             <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                             <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                             <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Command.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Confirm.html b/doc/Cli/Confirm.html
index 7c3a6b5..7759049 100644
--- a/doc/Cli/Confirm.html
+++ b/doc/Cli/Confirm.html
@@ -1,271 +1,271 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Confirm</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Confirm";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Confirm.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Confirm.html" target="_top">Frames</a></li>
-<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cli</div>
-<h2 title="Class Confirm" class="title">Class Confirm</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Cli.Confirm</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Confirm</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Confirm.html#Confirm--">Confirm</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Confirm.html#text-java.lang.String-">text</a></span>(java.lang.String&nbsp;str)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Confirm--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Confirm</h4>
-<pre>public&nbsp;Confirm()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="text-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>text</h4>
-<pre>public static&nbsp;boolean&nbsp;text(java.lang.String&nbsp;str)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Confirm.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Confirm.html" target="_top">Frames</a></li>
-<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:35:36 CEST 2017 -->
+<title>Confirm</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Confirm";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Confirm.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Confirm.html" target="_top">Frames</a></li>
+<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class Confirm" class="title">Class Confirm</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Confirm</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Confirm</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Confirm.html#Confirm--">Confirm</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Confirm.html#text-java.lang.String-">text</a></span>(java.lang.String&nbsp;str)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Confirm--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Confirm</h4>
+<pre>public&nbsp;Confirm()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="text-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>text</h4>
+<pre>public static&nbsp;boolean&nbsp;text(java.lang.String&nbsp;str)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Confirm.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Confirm.html" target="_top">Frames</a></li>
+<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Input.html b/doc/Cli/Input.html
index 1cfc8fe..66c00a0 100644
--- a/doc/Cli/Input.html
+++ b/doc/Cli/Input.html
@@ -1,271 +1,271 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Input</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Input";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Input.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Input.html" target="_top">Frames</a></li>
-<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Cli</div>
-<h2 title="Class Input" class="title">Class Input</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Cli.Input</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Input</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Input.html#Input--">Input</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Input.html#string-java.lang.String-">string</a></span>(java.lang.String&nbsp;question)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Input--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Input</h4>
-<pre>public&nbsp;Input()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="string-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>string</h4>
-<pre>public static&nbsp;java.lang.String&nbsp;string(java.lang.String&nbsp;question)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Input.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/Input.html" target="_top">Frames</a></li>
-<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Input</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Input";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Input.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Input.html" target="_top">Frames</a></li>
+<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class Input" class="title">Class Input</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Input</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Input</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Input.html#Input--">Input</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Input.html#string-java.lang.String-">string</a></span>(java.lang.String&nbsp;question)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Input--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Input</h4>
+<pre>public&nbsp;Input()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="string-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>string</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;string(java.lang.String&nbsp;question)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Input.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Input.html" target="_top">Frames</a></li>
+<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Token.TypeToken.html b/doc/Cli/Token.TypeToken.html
new file mode 100644
index 0000000..bd9c0b1
--- /dev/null
+++ b/doc/Cli/Token.TypeToken.html
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Token.TypeToken</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Token.TypeToken";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Token.TypeToken.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Token.TypeToken.html" target="_top">Frames</a></li>
+<li><a href="Token.TypeToken.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Enum Token.TypeToken" class="title">Enum Token.TypeToken</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Enum&lt;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Token.TypeToken</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../Cli/Token.html" title="class in Cli">Token</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static enum <span class="typeNameLabel">Token.TypeToken</span>
+extends java.lang.Enum&lt;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&gt;</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#date">date</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#decimal">decimal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#integer">integer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#position">position</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#str">str</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
+<code>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="date">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>date</h4>
+<pre>public static final&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> date</pre>
+</li>
+</ul>
+<a name="str">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>str</h4>
+<pre>public static final&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> str</pre>
+</li>
+</ul>
+<a name="integer">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>integer</h4>
+<pre>public static final&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> integer</pre>
+</li>
+</ul>
+<a name="decimal">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>decimal</h4>
+<pre>public static final&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> decimal</pre>
+</li>
+</ul>
+<a name="position">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>position</h4>
+<pre>public static final&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> position</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (Token.TypeToken c : Token.TypeToken.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Token.TypeToken.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Token.TypeToken.html" target="_top">Frames</a></li>
+<li><a href="Token.TypeToken.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/Token.html b/doc/Cli/Token.html
new file mode 100644
index 0000000..5df216b
--- /dev/null
+++ b/doc/Cli/Token.html
@@ -0,0 +1,329 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Token</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Token";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Token.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Token.TypeToken.html" title="enum in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Token.html" target="_top">Frames</a></li>
+<li><a href="Token.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class Token" class="title">Class Token</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Cli.Token</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Token</span>
+extends java.lang.Object</pre>
+<div class="block">A token represent a container for an argument, each time a command is given,
+ The Clui will try to match each argument in it's associated Token.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/Token.html#Token-Cli.Token.TypeToken-java.lang.String-">Token</a></span>(<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&nbsp;_typeOfToken,
+     java.lang.String&nbsp;_name)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.html#isTockenCorrect-java.lang.String-">isTockenCorrect</a></span>(java.lang.String&nbsp;_value)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Cli/Token.html#setValue-java.lang.String-">setValue</a></span>(java.lang.String&nbsp;_value)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Token-Cli.Token.TypeToken-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Token</h4>
+<pre>public&nbsp;Token(<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&nbsp;_typeOfToken,
+             java.lang.String&nbsp;_name)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setValue-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setValue</h4>
+<pre>public&nbsp;void&nbsp;setValue(java.lang.String&nbsp;_value)
+              throws <a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValue--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValue</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getValue()</pre>
+</li>
+</ul>
+<a name="isTockenCorrect-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isTockenCorrect</h4>
+<pre>public&nbsp;boolean&nbsp;isTockenCorrect(java.lang.String&nbsp;_value)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Token.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Token.TypeToken.html" title="enum in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/Token.html" target="_top">Frames</a></li>
+<li><a href="Token.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Clui.html b/doc/Cli/class-use/Clui.html
index 90fa012..f8343ed 100644
--- a/doc/Cli/class-use/Clui.html
+++ b/doc/Cli/class-use/Clui.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cli.Clui</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cli.Clui";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Clui.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Clui.html" target="_top">Frames</a></li>
-<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cli.Clui" class="title">Uses of Class<br>Cli.Clui</h2>
-</div>
-<div class="classUseContainer">No usage of Cli.Clui</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Clui.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Clui.html" target="_top">Frames</a></li>
-<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.Clui</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Clui";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Clui.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Clui.html" target="_top">Frames</a></li>
+<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Clui" class="title">Uses of Class<br>Cli.Clui</h2>
+</div>
+<div class="classUseContainer">No usage of Cli.Clui</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Clui.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Clui.html" target="_top">Frames</a></li>
+<li><a href="Clui.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Command.html b/doc/Cli/class-use/Command.html
new file mode 100644
index 0000000..a8dd7f0
--- /dev/null
+++ b/doc/Cli/class-use/Command.html
@@ -0,0 +1,310 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.Command</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Command";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Command.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Command" class="title">Uses of Class<br>Cli.Command</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cli/Command.html" title="class in Cli">Command</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/Command.html" title="class in Cli">Command</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that return <a href="../../Cli/Command.html" title="class in Cli">Command</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Cli/Command.html" title="class in Cli">Command</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Clui.</span><code><span class="memberNameLink"><a href="../../Cli/Clui.html#getCommand-java.lang.String-">getCommand</a></span>(java.lang.String&nbsp;commandName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/Command.html" title="class in Cli">Command</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../Cli/Command.html" title="class in Cli">Command</a> in <a href="../../Commands/package-summary.html">Commands</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/AssociateCard.html" title="class in Commands">AssociateCard</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/CreateMeal.html" title="class in Commands">CreateMeal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/CreateOrder.html" title="class in Commands">CreateOrder</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/EndOrder.html" title="class in Commands">EndOrder</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/Help.html" title="class in Commands">Help</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/Login.html" title="class in Commands">Login</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/Logout.html" title="class in Commands">Logout</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/OffDuty.html" title="class in Commands">OffDuty</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/OnDuty.html" title="class in Commands">OnDuty</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RegisterManager.html" title="class in Commands">RegisterManager</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RenameMeal.html" title="class in Commands">RenameMeal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/RunTest.html" title="class in Commands">RunTest</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowCourier.html" title="class in Commands">ShowCourier</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowMeal.html" title="class in Commands">ShowMeal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Command.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Confirm.html b/doc/Cli/class-use/Confirm.html
index 7d117b0..b2f657d 100644
--- a/doc/Cli/class-use/Confirm.html
+++ b/doc/Cli/class-use/Confirm.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cli.Confirm</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cli.Confirm";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Confirm.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Confirm.html" target="_top">Frames</a></li>
-<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cli.Confirm" class="title">Uses of Class<br>Cli.Confirm</h2>
-</div>
-<div class="classUseContainer">No usage of Cli.Confirm</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Confirm.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Confirm.html" target="_top">Frames</a></li>
-<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:35:44 CEST 2017 -->
+<title>Uses of Class Cli.Confirm</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Confirm";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Confirm.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Confirm.html" target="_top">Frames</a></li>
+<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Confirm" class="title">Uses of Class<br>Cli.Confirm</h2>
+</div>
+<div class="classUseContainer">No usage of Cli.Confirm</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Confirm.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Confirm.html" target="_top">Frames</a></li>
+<li><a href="Confirm.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Input.html b/doc/Cli/class-use/Input.html
index 4a75e88..8ea79a9 100644
--- a/doc/Cli/class-use/Input.html
+++ b/doc/Cli/class-use/Input.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Cli.Input</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Cli.Input";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Input.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Input.html" target="_top">Frames</a></li>
-<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Cli.Input" class="title">Uses of Class<br>Cli.Input</h2>
-</div>
-<div class="classUseContainer">No usage of Cli.Input</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Cli/Input.html" title="class in Cli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Cli/class-use/Input.html" target="_top">Frames</a></li>
-<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.Input</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Input";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Input.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Input.html" target="_top">Frames</a></li>
+<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Input" class="title">Uses of Class<br>Cli.Input</h2>
+</div>
+<div class="classUseContainer">No usage of Cli.Input</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Input.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Input.html" target="_top">Frames</a></li>
+<li><a href="Input.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Token.TypeToken.html b/doc/Cli/class-use/Token.TypeToken.html
new file mode 100644
index 0000000..44c01e0
--- /dev/null
+++ b/doc/Cli/class-use/Token.TypeToken.html
@@ -0,0 +1,185 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cli.Token.TypeToken</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Token.TypeToken";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Token.TypeToken.html" target="_top">Frames</a></li>
+<li><a href="Token.TypeToken.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Token.TypeToken" class="title">Uses of Class<br>Cli.Token.TypeToken</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that return <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Token.TypeToken.</span><code><span class="memberNameLink"><a href="../../Cli/Token.TypeToken.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>[]</code></td>
+<td class="colLast"><span class="typeNameLabel">Token.TypeToken.</span><code><span class="memberNameLink"><a href="../../Cli/Token.TypeToken.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cli/Token.html#Token-Cli.Token.TypeToken-java.lang.String-">Token</a></span>(<a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a>&nbsp;_typeOfToken,
+     java.lang.String&nbsp;_name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Token.TypeToken.html" title="enum in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Token.TypeToken.html" target="_top">Frames</a></li>
+<li><a href="Token.TypeToken.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/Token.html b/doc/Cli/class-use/Token.html
new file mode 100644
index 0000000..702d6e8
--- /dev/null
+++ b/doc/Cli/class-use/Token.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class Cli.Token</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.Token";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Token.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Token.html" target="_top">Frames</a></li>
+<li><a href="Token.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.Token" class="title">Uses of Class<br>Cli.Token</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cli/Token.html" title="class in Cli">Token</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/Token.html" title="class in Cli">Token</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Cli/Token.html" title="class in Cli">Token</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cli/Command.html#Command-java.lang.String-Cli.Token:A-">Command</a></span>(java.lang.String&nbsp;_commandName,
+       <a href="../../Cli/Token.html" title="class in Cli">Token</a>[]&nbsp;_listOfArgs)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/Token.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/Token.html" target="_top">Frames</a></li>
+<li><a href="Token.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/errorWrongFormatValue.html b/doc/Cli/class-use/errorWrongFormatValue.html
new file mode 100644
index 0000000..7e73c55
--- /dev/null
+++ b/doc/Cli/class-use/errorWrongFormatValue.html
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.errorWrongFormatValue</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.errorWrongFormatValue";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongFormatValue.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongFormatValue.html" target="_top">Frames</a></li>
+<li><a href="errorWrongFormatValue.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.errorWrongFormatValue" class="title">Uses of Class<br>Cli.errorWrongFormatValue</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Token.</span><code><span class="memberNameLink"><a href="../../Cli/Token.html#setValue-java.lang.String-">setValue</a></span>(java.lang.String&nbsp;_value)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongFormatValue.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongFormatValue.html" target="_top">Frames</a></li>
+<li><a href="errorWrongFormatValue.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/errorWrongNumberOfParams.html b/doc/Cli/class-use/errorWrongNumberOfParams.html
new file mode 100644
index 0000000..625f678
--- /dev/null
+++ b/doc/Cli/class-use/errorWrongNumberOfParams.html
@@ -0,0 +1,164 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.errorWrongNumberOfParams</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.errorWrongNumberOfParams";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongNumberOfParams.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongNumberOfParams.html" target="_top">Frames</a></li>
+<li><a href="errorWrongNumberOfParams.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.errorWrongNumberOfParams" class="title">Uses of Class<br>Cli.errorWrongNumberOfParams</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongNumberOfParams.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongNumberOfParams.html" target="_top">Frames</a></li>
+<li><a href="errorWrongNumberOfParams.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/class-use/errorWrongTypeOfUser.html b/doc/Cli/class-use/errorWrongTypeOfUser.html
new file mode 100644
index 0000000..a72b141
--- /dev/null
+++ b/doc/Cli/class-use/errorWrongTypeOfUser.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Cli.errorWrongTypeOfUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Cli.errorWrongTypeOfUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongTypeOfUser.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="errorWrongTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Cli.errorWrongTypeOfUser" class="title">Uses of Class<br>Cli.errorWrongTypeOfUser</h2>
+</div>
+<div class="classUseContainer">No usage of Cli.errorWrongTypeOfUser</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Cli/errorWrongTypeOfUser.html" title="class in Cli">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Cli/class-use/errorWrongTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="errorWrongTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/errorWrongFormatValue.html b/doc/Cli/errorWrongFormatValue.html
new file mode 100644
index 0000000..42fcb55
--- /dev/null
+++ b/doc/Cli/errorWrongFormatValue.html
@@ -0,0 +1,318 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>errorWrongFormatValue</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="errorWrongFormatValue";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongFormatValue.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongFormatValue.html" target="_top">Frames</a></li>
+<li><a href="errorWrongFormatValue.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class errorWrongFormatValue" class="title">Class errorWrongFormatValue</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Cli.errorWrongFormatValue</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">errorWrongFormatValue</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Cli.errorWrongFormatValue">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue--">errorWrongFormatValue</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-">errorWrongFormatValue</a></span>(java.lang.String&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-java.lang.Throwable-">errorWrongFormatValue</a></span>(java.lang.String&nbsp;arg0,
+                     java.lang.Throwable&nbsp;arg1)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongFormatValue</a></span>(java.lang.String&nbsp;arg0,
+                     java.lang.Throwable&nbsp;arg1,
+                     boolean&nbsp;arg2,
+                     boolean&nbsp;arg3)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.Throwable-">errorWrongFormatValue</a></span>(java.lang.Throwable&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="errorWrongFormatValue--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongFormatValue</h4>
+<pre>public&nbsp;errorWrongFormatValue()</pre>
+</li>
+</ul>
+<a name="errorWrongFormatValue-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongFormatValue</h4>
+<pre>public&nbsp;errorWrongFormatValue(java.lang.String&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="errorWrongFormatValue-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongFormatValue</h4>
+<pre>public&nbsp;errorWrongFormatValue(java.lang.Throwable&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="errorWrongFormatValue-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongFormatValue</h4>
+<pre>public&nbsp;errorWrongFormatValue(java.lang.String&nbsp;arg0,
+                             java.lang.Throwable&nbsp;arg1)</pre>
+</li>
+</ul>
+<a name="errorWrongFormatValue-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>errorWrongFormatValue</h4>
+<pre>public&nbsp;errorWrongFormatValue(java.lang.String&nbsp;arg0,
+                             java.lang.Throwable&nbsp;arg1,
+                             boolean&nbsp;arg2,
+                             boolean&nbsp;arg3)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongFormatValue.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongFormatValue.html" target="_top">Frames</a></li>
+<li><a href="errorWrongFormatValue.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/errorWrongNumberOfParams.html b/doc/Cli/errorWrongNumberOfParams.html
new file mode 100644
index 0000000..77e3f5c
--- /dev/null
+++ b/doc/Cli/errorWrongNumberOfParams.html
@@ -0,0 +1,318 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>errorWrongNumberOfParams</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="errorWrongNumberOfParams";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongNumberOfParams.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongNumberOfParams.html" target="_top">Frames</a></li>
+<li><a href="errorWrongNumberOfParams.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class errorWrongNumberOfParams" class="title">Class errorWrongNumberOfParams</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Cli.errorWrongNumberOfParams</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">errorWrongNumberOfParams</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Cli.errorWrongNumberOfParams">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams--">errorWrongNumberOfParams</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-">errorWrongNumberOfParams</a></span>(java.lang.String&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-">errorWrongNumberOfParams</a></span>(java.lang.String&nbsp;arg0,
+                        java.lang.Throwable&nbsp;arg1)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongNumberOfParams</a></span>(java.lang.String&nbsp;arg0,
+                        java.lang.Throwable&nbsp;arg1,
+                        boolean&nbsp;arg2,
+                        boolean&nbsp;arg3)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.Throwable-">errorWrongNumberOfParams</a></span>(java.lang.Throwable&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="errorWrongNumberOfParams--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongNumberOfParams</h4>
+<pre>public&nbsp;errorWrongNumberOfParams()</pre>
+</li>
+</ul>
+<a name="errorWrongNumberOfParams-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongNumberOfParams</h4>
+<pre>public&nbsp;errorWrongNumberOfParams(java.lang.String&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="errorWrongNumberOfParams-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongNumberOfParams</h4>
+<pre>public&nbsp;errorWrongNumberOfParams(java.lang.Throwable&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongNumberOfParams</h4>
+<pre>public&nbsp;errorWrongNumberOfParams(java.lang.String&nbsp;arg0,
+                                java.lang.Throwable&nbsp;arg1)</pre>
+</li>
+</ul>
+<a name="errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>errorWrongNumberOfParams</h4>
+<pre>public&nbsp;errorWrongNumberOfParams(java.lang.String&nbsp;arg0,
+                                java.lang.Throwable&nbsp;arg1,
+                                boolean&nbsp;arg2,
+                                boolean&nbsp;arg3)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongNumberOfParams.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongNumberOfParams.html" target="_top">Frames</a></li>
+<li><a href="errorWrongNumberOfParams.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/errorWrongTypeOfUser.html b/doc/Cli/errorWrongTypeOfUser.html
new file mode 100644
index 0000000..afd32cd
--- /dev/null
+++ b/doc/Cli/errorWrongTypeOfUser.html
@@ -0,0 +1,318 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>errorWrongTypeOfUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="errorWrongTypeOfUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongTypeOfUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="errorWrongTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Cli</div>
+<h2 title="Class errorWrongTypeOfUser" class="title">Class errorWrongTypeOfUser</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Cli.errorWrongTypeOfUser</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">errorWrongTypeOfUser</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Cli.errorWrongTypeOfUser">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser--">errorWrongTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-">errorWrongTypeOfUser</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-">errorWrongTypeOfUser</a></span>(java.lang.String&nbsp;message,
+                    java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongTypeOfUser</a></span>(java.lang.String&nbsp;message,
+                    java.lang.Throwable&nbsp;cause,
+                    boolean&nbsp;enableSuppression,
+                    boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.Throwable-">errorWrongTypeOfUser</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="errorWrongTypeOfUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongTypeOfUser</h4>
+<pre>public&nbsp;errorWrongTypeOfUser()</pre>
+</li>
+</ul>
+<a name="errorWrongTypeOfUser-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongTypeOfUser</h4>
+<pre>public&nbsp;errorWrongTypeOfUser(java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
+<a name="errorWrongTypeOfUser-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongTypeOfUser</h4>
+<pre>public&nbsp;errorWrongTypeOfUser(java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>errorWrongTypeOfUser</h4>
+<pre>public&nbsp;errorWrongTypeOfUser(java.lang.String&nbsp;message,
+                            java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>errorWrongTypeOfUser</h4>
+<pre>public&nbsp;errorWrongTypeOfUser(java.lang.String&nbsp;message,
+                            java.lang.Throwable&nbsp;cause,
+                            boolean&nbsp;enableSuppression,
+                            boolean&nbsp;writableStackTrace)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/errorWrongTypeOfUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/errorWrongTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="errorWrongTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/package-frame.html b/doc/Cli/package-frame.html
index 0c005ea..5958c32 100644
--- a/doc/Cli/package-frame.html
+++ b/doc/Cli/package-frame.html
@@ -1,22 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cli</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Cli/package-summary.html" target="classFrame">Cli</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="Clui.html" title="class in Cli" target="classFrame">Clui</a></li>
-<li><a href="Confirm.html" title="class in Cli" target="classFrame">Confirm</a></li>
-<li><a href="Input.html" title="class in Cli" target="classFrame">Input</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cli</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Cli/package-summary.html" target="classFrame">Cli</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Clui.html" title="class in Cli" target="classFrame">Clui</a></li>
+<li><a href="Command.html" title="class in Cli" target="classFrame">Command</a></li>
+<li><a href="Input.html" title="class in Cli" target="classFrame">Input</a></li>
+<li><a href="Token.html" title="class in Cli" target="classFrame">Token</a></li>
+</ul>
+<h2 title="Enums">Enums</h2>
+<ul title="Enums">
+<li><a href="Token.TypeToken.html" title="enum in Cli" target="classFrame">Token.TypeToken</a></li>
+</ul>
+<h2 title="Exceptions">Exceptions</h2>
+<ul title="Exceptions">
+<li><a href="errorWrongFormatValue.html" title="class in Cli" target="classFrame">errorWrongFormatValue</a></li>
+<li><a href="errorWrongNumberOfParams.html" title="class in Cli" target="classFrame">errorWrongNumberOfParams</a></li>
+<li><a href="errorWrongTypeOfUser.html" title="class in Cli" target="classFrame">errorWrongTypeOfUser</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Cli/package-summary.html b/doc/Cli/package-summary.html
index b0913cb..4c526db 100644
--- a/doc/Cli/package-summary.html
+++ b/doc/Cli/package-summary.html
@@ -1,150 +1,200 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cli</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Cli";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Core/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Cli</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Cli/Clui.html" title="class in Cli">Clui</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Cli/Confirm.html" title="class in Cli">Confirm</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Cli/Input.html" title="class in Cli">Input</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Core/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cli</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Cli";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Commands/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Cli</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cli/Clui.html" title="class in Cli">Clui</a></td>
+<td class="colLast">
+<div class="block">Clui controller, create a context allowing cli into foodora system.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cli/Command.html" title="class in Cli">Command</a></td>
+<td class="colLast">
+<div class="block">Describes how all command are, composed by a commandName and a listOfArgs,
+ It allow to verify if each argument is correct, and if all arguments are there.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cli/Input.html" title="class in Cli">Input</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cli/Token.html" title="class in Cli">Token</a></td>
+<td class="colLast">
+<div class="block">A token represent a container for an argument, each time a command is given,
+ The Clui will try to match each argument in it's associated Token.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Enum</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
+<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Exception</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Commands/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/package-tree.html b/doc/Cli/package-tree.html
index 52983d8..5a10999 100644
--- a/doc/Cli/package-tree.html
+++ b/doc/Cli/package-tree.html
@@ -1,139 +1,163 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Cli Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Cli Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/package-tree.html">Prev</a></li>
-<li><a href="../Core/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Cli</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Cli.<a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a></li>
-<li type="circle">Cli.<a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Confirm</span></a></li>
-<li type="circle">Cli.<a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a></li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cards/package-tree.html">Prev</a></li>
-<li><a href="../Core/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Cli Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Cli Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/package-tree.html">Prev</a></li>
+<li><a href="../Commands/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Cli</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Cli.<a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a></li>
+<li type="circle">Cli.<a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Command</span></a></li>
+<li type="circle">Cli.<a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a></li>
+<li type="circle">java.lang.Throwable (implements java.io.Serializable)
+<ul>
+<li type="circle">java.lang.Exception
+<ul>
+<li type="circle">Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">errorWrongFormatValue</span></a></li>
+<li type="circle">Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">errorWrongNumberOfParams</span></a></li>
+<li type="circle">Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">errorWrongTypeOfUser</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">Cli.<a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Token</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
+<ul>
+<li type="circle">Cli.<a href="../Cli/Token.TypeToken.html" title="enum in Cli"><span class="typeNameLink">Token.TypeToken</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cards/package-tree.html">Prev</a></li>
+<li><a href="../Commands/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Cli/package-use.html b/doc/Cli/package-use.html
index c186937..b2d5375 100644
--- a/doc/Cli/package-use.html
+++ b/doc/Cli/package-use.html
@@ -1,124 +1,197 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Cli</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Cli";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Cli" class="title">Uses of Package<br>Cli</h1>
-</div>
-<div class="contentContainer">No usage of Cli</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Cli/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Cli</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Cli";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Cli" class="title">Uses of Package<br>Cli</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Cli/package-summary.html">Cli</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Cli/package-summary.html">Cli</a> used by <a href="../Cli/package-summary.html">Cli</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Cli/class-use/Command.html#Cli">Command</a>
+<div class="block">Describes how all command are, composed by a commandName and a listOfArgs,
+ It allow to verify if each argument is correct, and if all arguments are there.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cli/class-use/errorWrongFormatValue.html#Cli">errorWrongFormatValue</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Cli/class-use/errorWrongNumberOfParams.html#Cli">errorWrongNumberOfParams</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Cli/class-use/Token.html#Cli">Token</a>
+<div class="block">A token represent a container for an argument, each time a command is given,
+ The Clui will try to match each argument in it's associated Token.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Cli/class-use/Token.TypeToken.html#Cli">Token.TypeToken</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Cli/package-summary.html">Cli</a> used by <a href="../Commands/package-summary.html">Commands</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Cli/class-use/Command.html#Commands">Command</a>
+<div class="block">Describes how all command are, composed by a commandName and a listOfArgs,
+ It allow to verify if each argument is correct, and if all arguments are there.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Cli/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/AddDishRestaurantMenu.html b/doc/Commands/AddDishRestaurantMenu.html
new file mode 100644
index 0000000..3599076
--- /dev/null
+++ b/doc/Commands/AddDishRestaurantMenu.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>AddDishRestaurantMenu</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddDishRestaurantMenu";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddDishRestaurantMenu.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddDishRestaurantMenu.html" target="_top">Frames</a></li>
+<li><a href="AddDishRestaurantMenu.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class AddDishRestaurantMenu" class="title">Class AddDishRestaurantMenu</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.AddDishRestaurantMenu</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AddDishRestaurantMenu</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/AddDishRestaurantMenu.html#AddDishRestaurantMenu--">AddDishRestaurantMenu</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/AddDishRestaurantMenu.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AddDishRestaurantMenu--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AddDishRestaurantMenu</h4>
+<pre>public&nbsp;AddDishRestaurantMenu()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddDishRestaurantMenu.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddDishRestaurantMenu.html" target="_top">Frames</a></li>
+<li><a href="AddDishRestaurantMenu.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/AddDishToMeal.html b/doc/Commands/AddDishToMeal.html
new file mode 100644
index 0000000..2540811
--- /dev/null
+++ b/doc/Commands/AddDishToMeal.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>AddDishToMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddDishToMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddDishToMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddDishToMeal.html" target="_top">Frames</a></li>
+<li><a href="AddDishToMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class AddDishToMeal" class="title">Class AddDishToMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.AddDishToMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AddDishToMeal</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/AddDishToMeal.html#AddDishToMeal--">AddDishToMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/AddDishToMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AddDishToMeal--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AddDishToMeal</h4>
+<pre>public&nbsp;AddDishToMeal()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddDishToMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddDishToMeal.html" target="_top">Frames</a></li>
+<li><a href="AddDishToMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/AddItemToOrder.html b/doc/Commands/AddItemToOrder.html
new file mode 100644
index 0000000..ee90258
--- /dev/null
+++ b/doc/Commands/AddItemToOrder.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>AddItemToOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AddItemToOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddItemToOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddItemToOrder.html" target="_top">Frames</a></li>
+<li><a href="AddItemToOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class AddItemToOrder" class="title">Class AddItemToOrder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.AddItemToOrder</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AddItemToOrder</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/AddItemToOrder.html#AddItemToOrder--">AddItemToOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/AddItemToOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AddItemToOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AddItemToOrder</h4>
+<pre>public&nbsp;AddItemToOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AddItemToOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AddItemToOrder.html" target="_top">Frames</a></li>
+<li><a href="AddItemToOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/AssociateCard.html b/doc/Commands/AssociateCard.html
new file mode 100644
index 0000000..cb4f4e3
--- /dev/null
+++ b/doc/Commands/AssociateCard.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>AssociateCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AssociateCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AssociateCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AssociateCard.html" target="_top">Frames</a></li>
+<li><a href="AssociateCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class AssociateCard" class="title">Class AssociateCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.AssociateCard</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AssociateCard</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/AssociateCard.html#AssociateCard--">AssociateCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/AssociateCard.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AssociateCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AssociateCard</h4>
+<pre>public&nbsp;AssociateCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/AssociateCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/AssociateCard.html" target="_top">Frames</a></li>
+<li><a href="AssociateCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/CreateMeal.html b/doc/Commands/CreateMeal.html
new file mode 100644
index 0000000..0ff4c5f
--- /dev/null
+++ b/doc/Commands/CreateMeal.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>CreateMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CreateMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CreateMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/CreateMeal.html" target="_top">Frames</a></li>
+<li><a href="CreateMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class CreateMeal" class="title">Class CreateMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.CreateMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">CreateMeal</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/CreateMeal.html#CreateMeal--">CreateMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/CreateMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="CreateMeal--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CreateMeal</h4>
+<pre>public&nbsp;CreateMeal()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CreateMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/CreateMeal.html" target="_top">Frames</a></li>
+<li><a href="CreateMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/CreateOrder.html b/doc/Commands/CreateOrder.html
new file mode 100644
index 0000000..bed71ed
--- /dev/null
+++ b/doc/Commands/CreateOrder.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>CreateOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CreateOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CreateOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/CreateOrder.html" target="_top">Frames</a></li>
+<li><a href="CreateOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class CreateOrder" class="title">Class CreateOrder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.CreateOrder</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">CreateOrder</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/CreateOrder.html#CreateOrder--">CreateOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/CreateOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="CreateOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CreateOrder</h4>
+<pre>public&nbsp;CreateOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CreateOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/CreateOrder.html" target="_top">Frames</a></li>
+<li><a href="CreateOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/EndOrder.html b/doc/Commands/EndOrder.html
new file mode 100644
index 0000000..7fe48b4
--- /dev/null
+++ b/doc/Commands/EndOrder.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>EndOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="EndOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/EndOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/EndOrder.html" target="_top">Frames</a></li>
+<li><a href="EndOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class EndOrder" class="title">Class EndOrder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.EndOrder</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">EndOrder</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/EndOrder.html#EndOrder--">EndOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/EndOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="EndOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>EndOrder</h4>
+<pre>public&nbsp;EndOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/EndOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/EndOrder.html" target="_top">Frames</a></li>
+<li><a href="EndOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/EndOrderAt.html b/doc/Commands/EndOrderAt.html
new file mode 100644
index 0000000..5f1d4c7
--- /dev/null
+++ b/doc/Commands/EndOrderAt.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>EndOrderAt</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="EndOrderAt";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/EndOrderAt.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/EndOrderAt.html" target="_top">Frames</a></li>
+<li><a href="EndOrderAt.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class EndOrderAt" class="title">Class EndOrderAt</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.EndOrderAt</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">EndOrderAt</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/EndOrderAt.html#EndOrderAt--">EndOrderAt</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/EndOrderAt.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="EndOrderAt--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>EndOrderAt</h4>
+<pre>public&nbsp;EndOrderAt()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/EndOrderAt.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/EndOrderAt.html" target="_top">Frames</a></li>
+<li><a href="EndOrderAt.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/FindDeliverer.html b/doc/Commands/FindDeliverer.html
new file mode 100644
index 0000000..1abdeef
--- /dev/null
+++ b/doc/Commands/FindDeliverer.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>FindDeliverer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FindDeliverer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FindDeliverer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/FindDeliverer.html" target="_top">Frames</a></li>
+<li><a href="FindDeliverer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class FindDeliverer" class="title">Class FindDeliverer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.FindDeliverer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FindDeliverer</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/FindDeliverer.html#FindDeliverer--">FindDeliverer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/FindDeliverer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FindDeliverer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FindDeliverer</h4>
+<pre>public&nbsp;FindDeliverer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FindDeliverer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/FindDeliverer.html" target="_top">Frames</a></li>
+<li><a href="FindDeliverer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/Help.html b/doc/Commands/Help.html
new file mode 100644
index 0000000..f6f8dd1
--- /dev/null
+++ b/doc/Commands/Help.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>Help</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Help";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Help.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Help.html" target="_top">Frames</a></li>
+<li><a href="Help.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class Help" class="title">Class Help</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.Help</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Help</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/Help.html#Help--">Help</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/Help.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Help--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Help</h4>
+<pre>public&nbsp;Help()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Help.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Help.html" target="_top">Frames</a></li>
+<li><a href="Help.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/Login.html b/doc/Commands/Login.html
new file mode 100644
index 0000000..eb69fc4
--- /dev/null
+++ b/doc/Commands/Login.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>Login</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Login";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Login.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Login.html" target="_top">Frames</a></li>
+<li><a href="Login.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class Login" class="title">Class Login</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.Login</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Login</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/Login.html#Login--">Login</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/Login.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;args,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Login--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Login</h4>
+<pre>public&nbsp;Login()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;args,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Login.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Login.html" target="_top">Frames</a></li>
+<li><a href="Login.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/Logout.html b/doc/Commands/Logout.html
new file mode 100644
index 0000000..f4163c0
--- /dev/null
+++ b/doc/Commands/Logout.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>Logout</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Logout";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Logout.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Logout.html" target="_top">Frames</a></li>
+<li><a href="Logout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class Logout" class="title">Class Logout</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.Logout</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Logout</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/Logout.html#Logout--">Logout</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/Logout.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Logout--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Logout</h4>
+<pre>public&nbsp;Logout()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Logout.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/Logout.html" target="_top">Frames</a></li>
+<li><a href="Logout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/OffDuty.html b/doc/Commands/OffDuty.html
new file mode 100644
index 0000000..a0b044b
--- /dev/null
+++ b/doc/Commands/OffDuty.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>OffDuty</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="OffDuty";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/OffDuty.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/OffDuty.html" target="_top">Frames</a></li>
+<li><a href="OffDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class OffDuty" class="title">Class OffDuty</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.OffDuty</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">OffDuty</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/OffDuty.html#OffDuty--">OffDuty</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/OffDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="OffDuty--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OffDuty</h4>
+<pre>public&nbsp;OffDuty()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/OffDuty.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/OffDuty.html" target="_top">Frames</a></li>
+<li><a href="OffDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/OnDuty.html b/doc/Commands/OnDuty.html
new file mode 100644
index 0000000..6971ef2
--- /dev/null
+++ b/doc/Commands/OnDuty.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>OnDuty</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="OnDuty";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/OnDuty.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/OnDuty.html" target="_top">Frames</a></li>
+<li><a href="OnDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class OnDuty" class="title">Class OnDuty</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.OnDuty</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">OnDuty</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/OnDuty.html#OnDuty--">OnDuty</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/OnDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="OnDuty--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OnDuty</h4>
+<pre>public&nbsp;OnDuty()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/OnDuty.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/OnDuty.html" target="_top">Frames</a></li>
+<li><a href="OnDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RegisterCourier.html b/doc/Commands/RegisterCourier.html
new file mode 100644
index 0000000..589d308
--- /dev/null
+++ b/doc/Commands/RegisterCourier.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RegisterCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RegisterCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterCourier.html" target="_top">Frames</a></li>
+<li><a href="RegisterCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RegisterCourier" class="title">Class RegisterCourier</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RegisterCourier</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RegisterCourier</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RegisterCourier.html#RegisterCourier--">RegisterCourier</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RegisterCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RegisterCourier--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RegisterCourier</h4>
+<pre>public&nbsp;RegisterCourier()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterCourier.html" target="_top">Frames</a></li>
+<li><a href="RegisterCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RegisterCustomer.html b/doc/Commands/RegisterCustomer.html
new file mode 100644
index 0000000..4a6fda1
--- /dev/null
+++ b/doc/Commands/RegisterCustomer.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RegisterCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RegisterCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterCustomer.html" target="_top">Frames</a></li>
+<li><a href="RegisterCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RegisterCustomer" class="title">Class RegisterCustomer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RegisterCustomer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RegisterCustomer</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RegisterCustomer.html#RegisterCustomer--">RegisterCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RegisterCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RegisterCustomer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RegisterCustomer</h4>
+<pre>public&nbsp;RegisterCustomer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterCustomer.html" target="_top">Frames</a></li>
+<li><a href="RegisterCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RegisterManager.html b/doc/Commands/RegisterManager.html
new file mode 100644
index 0000000..81660e7
--- /dev/null
+++ b/doc/Commands/RegisterManager.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RegisterManager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RegisterManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterManager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterManager.html" target="_top">Frames</a></li>
+<li><a href="RegisterManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RegisterManager" class="title">Class RegisterManager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RegisterManager</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RegisterManager</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RegisterManager.html#RegisterManager--">RegisterManager</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RegisterManager.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RegisterManager--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RegisterManager</h4>
+<pre>public&nbsp;RegisterManager()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterManager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterManager.html" target="_top">Frames</a></li>
+<li><a href="RegisterManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RegisterRestaurant.html b/doc/Commands/RegisterRestaurant.html
new file mode 100644
index 0000000..fd93893
--- /dev/null
+++ b/doc/Commands/RegisterRestaurant.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RegisterRestaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RegisterRestaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterRestaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterRestaurant.html" target="_top">Frames</a></li>
+<li><a href="RegisterRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RegisterRestaurant" class="title">Class RegisterRestaurant</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RegisterRestaurant</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RegisterRestaurant</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RegisterRestaurant.html#RegisterRestaurant--">RegisterRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RegisterRestaurant.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RegisterRestaurant--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RegisterRestaurant</h4>
+<pre>public&nbsp;RegisterRestaurant()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RegisterRestaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RegisterRestaurant.html" target="_top">Frames</a></li>
+<li><a href="RegisterRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RemoveSpecialOffer.html b/doc/Commands/RemoveSpecialOffer.html
new file mode 100644
index 0000000..a428b61
--- /dev/null
+++ b/doc/Commands/RemoveSpecialOffer.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RemoveSpecialOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RemoveSpecialOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RemoveSpecialOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RemoveSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="RemoveSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RemoveSpecialOffer" class="title">Class RemoveSpecialOffer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RemoveSpecialOffer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RemoveSpecialOffer</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RemoveSpecialOffer.html#RemoveSpecialOffer--">RemoveSpecialOffer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RemoveSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RemoveSpecialOffer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RemoveSpecialOffer</h4>
+<pre>public&nbsp;RemoveSpecialOffer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RemoveSpecialOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RemoveSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="RemoveSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RenameMeal.html b/doc/Commands/RenameMeal.html
new file mode 100644
index 0000000..13102b0
--- /dev/null
+++ b/doc/Commands/RenameMeal.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RenameMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RenameMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RenameMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RenameMeal.html" target="_top">Frames</a></li>
+<li><a href="RenameMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RenameMeal" class="title">Class RenameMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RenameMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RenameMeal</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RenameMeal.html#RenameMeal--">RenameMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RenameMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RenameMeal--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RenameMeal</h4>
+<pre>public&nbsp;RenameMeal()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RenameMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RenameMeal.html" target="_top">Frames</a></li>
+<li><a href="RenameMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/RunTest.html b/doc/Commands/RunTest.html
new file mode 100644
index 0000000..2929724
--- /dev/null
+++ b/doc/Commands/RunTest.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>RunTest</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="RunTest";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RunTest.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RunTest.html" target="_top">Frames</a></li>
+<li><a href="RunTest.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class RunTest" class="title">Class RunTest</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.RunTest</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">RunTest</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/RunTest.html#RunTest--">RunTest</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/RunTest.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="RunTest--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>RunTest</h4>
+<pre>public&nbsp;RunTest()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RunTest.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/RunTest.html" target="_top">Frames</a></li>
+<li><a href="RunTest.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/SetDeliveryPolicy.html b/doc/Commands/SetDeliveryPolicy.html
new file mode 100644
index 0000000..179bbf7
--- /dev/null
+++ b/doc/Commands/SetDeliveryPolicy.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>SetDeliveryPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SetDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class SetDeliveryPolicy" class="title">Class SetDeliveryPolicy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.SetDeliveryPolicy</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">SetDeliveryPolicy</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/SetDeliveryPolicy.html#SetDeliveryPolicy--">SetDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/SetDeliveryPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="SetDeliveryPolicy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SetDeliveryPolicy</h4>
+<pre>public&nbsp;SetDeliveryPolicy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/SetProfitPolicy.html b/doc/Commands/SetProfitPolicy.html
new file mode 100644
index 0000000..271cd2d
--- /dev/null
+++ b/doc/Commands/SetProfitPolicy.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>SetProfitPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SetProfitPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetProfitPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class SetProfitPolicy" class="title">Class SetProfitPolicy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.SetProfitPolicy</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">SetProfitPolicy</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/SetProfitPolicy.html#SetProfitPolicy--">SetProfitPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/SetProfitPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="SetProfitPolicy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SetProfitPolicy</h4>
+<pre>public&nbsp;SetProfitPolicy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException,
+                    <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetProfitPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/SetSpecialOffer.html b/doc/Commands/SetSpecialOffer.html
new file mode 100644
index 0000000..c62475d
--- /dev/null
+++ b/doc/Commands/SetSpecialOffer.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>SetSpecialOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SetSpecialOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetSpecialOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="SetSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class SetSpecialOffer" class="title">Class SetSpecialOffer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.SetSpecialOffer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">SetSpecialOffer</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/SetSpecialOffer.html#SetSpecialOffer--">SetSpecialOffer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/SetSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="SetSpecialOffer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SetSpecialOffer</h4>
+<pre>public&nbsp;SetSpecialOffer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/SetSpecialOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/SetSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="SetSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowCourier.html b/doc/Commands/ShowCourier.html
new file mode 100644
index 0000000..937a003
--- /dev/null
+++ b/doc/Commands/ShowCourier.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCourier.html" target="_top">Frames</a></li>
+<li><a href="ShowCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowCourier" class="title">Class ShowCourier</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowCourier</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowCourier</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowCourier.html#ShowCourier--">ShowCourier</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowCourier--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowCourier</h4>
+<pre>public&nbsp;ShowCourier()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCourier.html" target="_top">Frames</a></li>
+<li><a href="ShowCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowCourierOrdered.html b/doc/Commands/ShowCourierOrdered.html
new file mode 100644
index 0000000..3fcbf23
--- /dev/null
+++ b/doc/Commands/ShowCourierOrdered.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowCourierOrdered</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowCourierOrdered";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCourierOrdered.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCourierOrdered.html" target="_top">Frames</a></li>
+<li><a href="ShowCourierOrdered.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowCourierOrdered" class="title">Class ShowCourierOrdered</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowCourierOrdered</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowCourierOrdered</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowCourierOrdered.html#ShowCourierOrdered--">ShowCourierOrdered</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowCourierOrdered.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowCourierOrdered--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowCourierOrdered</h4>
+<pre>public&nbsp;ShowCourierOrdered()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCourierOrdered.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCourierOrdered.html" target="_top">Frames</a></li>
+<li><a href="ShowCourierOrdered.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowCustomer.html b/doc/Commands/ShowCustomer.html
new file mode 100644
index 0000000..16631a6
--- /dev/null
+++ b/doc/Commands/ShowCustomer.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCustomer.html" target="_top">Frames</a></li>
+<li><a href="ShowCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowCustomer" class="title">Class ShowCustomer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowCustomer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowCustomer</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowCustomer.html#ShowCustomer--">ShowCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowCustomer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowCustomer</h4>
+<pre>public&nbsp;ShowCustomer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowCustomer.html" target="_top">Frames</a></li>
+<li><a href="ShowCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowMeal.html b/doc/Commands/ShowMeal.html
new file mode 100644
index 0000000..160f970
--- /dev/null
+++ b/doc/Commands/ShowMeal.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowMeal.html" target="_top">Frames</a></li>
+<li><a href="ShowMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowMeal" class="title">Class ShowMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowMeal</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowMeal.html#ShowMeal--">ShowMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowMeal--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowMeal</h4>
+<pre>public&nbsp;ShowMeal()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowMeal.html" target="_top">Frames</a></li>
+<li><a href="ShowMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowMenuItem.html b/doc/Commands/ShowMenuItem.html
new file mode 100644
index 0000000..a3d0161
--- /dev/null
+++ b/doc/Commands/ShowMenuItem.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowMenuItem</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowMenuItem";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowMenuItem.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowMenuItem.html" target="_top">Frames</a></li>
+<li><a href="ShowMenuItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowMenuItem" class="title">Class ShowMenuItem</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowMenuItem</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowMenuItem</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowMenuItem.html#ShowMenuItem--">ShowMenuItem</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowMenuItem.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowMenuItem--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowMenuItem</h4>
+<pre>public&nbsp;ShowMenuItem()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)
+             throws java.lang.NumberFormatException</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NumberFormatException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowMenuItem.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowMenuItem.html" target="_top">Frames</a></li>
+<li><a href="ShowMenuItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowProfitBetween.html b/doc/Commands/ShowProfitBetween.html
new file mode 100644
index 0000000..6d99f26
--- /dev/null
+++ b/doc/Commands/ShowProfitBetween.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowProfitBetween</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowProfitBetween";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowProfitBetween.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowProfitBetween.html" target="_top">Frames</a></li>
+<li><a href="ShowProfitBetween.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowProfitBetween" class="title">Class ShowProfitBetween</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowProfitBetween</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowProfitBetween</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowProfitBetween.html#ShowProfitBetween--">ShowProfitBetween</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowProfitBetween.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowProfitBetween--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowProfitBetween</h4>
+<pre>public&nbsp;ShowProfitBetween()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowProfitBetween.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowProfitBetween.html" target="_top">Frames</a></li>
+<li><a href="ShowProfitBetween.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowRestaurantTop.html b/doc/Commands/ShowRestaurantTop.html
new file mode 100644
index 0000000..60e20a2
--- /dev/null
+++ b/doc/Commands/ShowRestaurantTop.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowRestaurantTop</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowRestaurantTop";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowRestaurantTop.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowTotalProfit.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowRestaurantTop.html" target="_top">Frames</a></li>
+<li><a href="ShowRestaurantTop.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowRestaurantTop" class="title">Class ShowRestaurantTop</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowRestaurantTop</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowRestaurantTop</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowRestaurantTop.html#ShowRestaurantTop--">ShowRestaurantTop</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowRestaurantTop.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowRestaurantTop--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowRestaurantTop</h4>
+<pre>public&nbsp;ShowRestaurantTop()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowRestaurantTop.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Commands/ShowTotalProfit.html" title="class in Commands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowRestaurantTop.html" target="_top">Frames</a></li>
+<li><a href="ShowRestaurantTop.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/ShowTotalProfit.html b/doc/Commands/ShowTotalProfit.html
new file mode 100644
index 0000000..31c32da
--- /dev/null
+++ b/doc/Commands/ShowTotalProfit.html
@@ -0,0 +1,291 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ShowTotalProfit</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ShowTotalProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowTotalProfit.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowTotalProfit.html" target="_top">Frames</a></li>
+<li><a href="ShowTotalProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Commands</div>
+<h2 title="Class ShowTotalProfit" class="title">Class ShowTotalProfit</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Cli/Command.html" title="class in Cli">Cli.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>Commands.ShowTotalProfit</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ShowTotalProfit</span>
+extends <a href="../Cli/Command.html" title="class in Cli">Command</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Commands/ShowTotalProfit.html#ShowTotalProfit--">ShowTotalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Commands/ShowTotalProfit.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Cli.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></h3>
+<code><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument</a>, <a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ShowTotalProfit--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ShowTotalProfit</h4>
+<pre>public&nbsp;ShowTotalProfit()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    <a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></code>&nbsp;in class&nbsp;<code><a href="../Cli/Command.html" title="class in Cli">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ShowTotalProfit.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/ShowTotalProfit.html" target="_top">Frames</a></li>
+<li><a href="ShowTotalProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/AddDishRestaurantMenu.html b/doc/Commands/class-use/AddDishRestaurantMenu.html
new file mode 100644
index 0000000..3b19fb3
--- /dev/null
+++ b/doc/Commands/class-use/AddDishRestaurantMenu.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Commands.AddDishRestaurantMenu</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.AddDishRestaurantMenu";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddDishRestaurantMenu.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddDishRestaurantMenu.html" target="_top">Frames</a></li>
+<li><a href="AddDishRestaurantMenu.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.AddDishRestaurantMenu" class="title">Uses of Class<br>Commands.AddDishRestaurantMenu</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.AddDishRestaurantMenu</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddDishRestaurantMenu.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddDishRestaurantMenu.html" target="_top">Frames</a></li>
+<li><a href="AddDishRestaurantMenu.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/AddDishToMeal.html b/doc/Commands/class-use/AddDishToMeal.html
new file mode 100644
index 0000000..b62210a
--- /dev/null
+++ b/doc/Commands/class-use/AddDishToMeal.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Commands.AddDishToMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.AddDishToMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddDishToMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddDishToMeal.html" target="_top">Frames</a></li>
+<li><a href="AddDishToMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.AddDishToMeal" class="title">Uses of Class<br>Commands.AddDishToMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.AddDishToMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddDishToMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddDishToMeal.html" target="_top">Frames</a></li>
+<li><a href="AddDishToMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/AddItemToOrder.html b/doc/Commands/class-use/AddItemToOrder.html
new file mode 100644
index 0000000..301730f
--- /dev/null
+++ b/doc/Commands/class-use/AddItemToOrder.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Commands.AddItemToOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.AddItemToOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddItemToOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddItemToOrder.html" target="_top">Frames</a></li>
+<li><a href="AddItemToOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.AddItemToOrder" class="title">Uses of Class<br>Commands.AddItemToOrder</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.AddItemToOrder</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AddItemToOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AddItemToOrder.html" target="_top">Frames</a></li>
+<li><a href="AddItemToOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/AssociateCard.html b/doc/Commands/class-use/AssociateCard.html
new file mode 100644
index 0000000..5c075ac
--- /dev/null
+++ b/doc/Commands/class-use/AssociateCard.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Commands.AssociateCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.AssociateCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AssociateCard.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AssociateCard.html" target="_top">Frames</a></li>
+<li><a href="AssociateCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.AssociateCard" class="title">Uses of Class<br>Commands.AssociateCard</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.AssociateCard</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/AssociateCard.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/AssociateCard.html" target="_top">Frames</a></li>
+<li><a href="AssociateCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/CreateMeal.html b/doc/Commands/class-use/CreateMeal.html
new file mode 100644
index 0000000..7e6cabd
--- /dev/null
+++ b/doc/Commands/class-use/CreateMeal.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.CreateMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.CreateMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/CreateMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/CreateMeal.html" target="_top">Frames</a></li>
+<li><a href="CreateMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.CreateMeal" class="title">Uses of Class<br>Commands.CreateMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.CreateMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/CreateMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/CreateMeal.html" target="_top">Frames</a></li>
+<li><a href="CreateMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/CreateOrder.html b/doc/Commands/class-use/CreateOrder.html
new file mode 100644
index 0000000..76769d5
--- /dev/null
+++ b/doc/Commands/class-use/CreateOrder.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.CreateOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.CreateOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/CreateOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/CreateOrder.html" target="_top">Frames</a></li>
+<li><a href="CreateOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.CreateOrder" class="title">Uses of Class<br>Commands.CreateOrder</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.CreateOrder</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/CreateOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/CreateOrder.html" target="_top">Frames</a></li>
+<li><a href="CreateOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/EndOrder.html b/doc/Commands/class-use/EndOrder.html
new file mode 100644
index 0000000..ce9e56e
--- /dev/null
+++ b/doc/Commands/class-use/EndOrder.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.EndOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.EndOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/EndOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/EndOrder.html" target="_top">Frames</a></li>
+<li><a href="EndOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.EndOrder" class="title">Uses of Class<br>Commands.EndOrder</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.EndOrder</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/EndOrder.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/EndOrder.html" target="_top">Frames</a></li>
+<li><a href="EndOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/EndOrderAt.html b/doc/Commands/class-use/EndOrderAt.html
new file mode 100644
index 0000000..210ff86
--- /dev/null
+++ b/doc/Commands/class-use/EndOrderAt.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.EndOrderAt</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.EndOrderAt";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/EndOrderAt.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/EndOrderAt.html" target="_top">Frames</a></li>
+<li><a href="EndOrderAt.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.EndOrderAt" class="title">Uses of Class<br>Commands.EndOrderAt</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.EndOrderAt</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/EndOrderAt.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/EndOrderAt.html" target="_top">Frames</a></li>
+<li><a href="EndOrderAt.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/FindDeliverer.html b/doc/Commands/class-use/FindDeliverer.html
new file mode 100644
index 0000000..a9bc7b5
--- /dev/null
+++ b/doc/Commands/class-use/FindDeliverer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.FindDeliverer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.FindDeliverer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/FindDeliverer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/FindDeliverer.html" target="_top">Frames</a></li>
+<li><a href="FindDeliverer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.FindDeliverer" class="title">Uses of Class<br>Commands.FindDeliverer</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.FindDeliverer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/FindDeliverer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/FindDeliverer.html" target="_top">Frames</a></li>
+<li><a href="FindDeliverer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/Help.html b/doc/Commands/class-use/Help.html
new file mode 100644
index 0000000..0f09b57
--- /dev/null
+++ b/doc/Commands/class-use/Help.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.Help</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.Help";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Help.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Help.html" target="_top">Frames</a></li>
+<li><a href="Help.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.Help" class="title">Uses of Class<br>Commands.Help</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.Help</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Help.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Help.html" target="_top">Frames</a></li>
+<li><a href="Help.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/Login.html b/doc/Commands/class-use/Login.html
new file mode 100644
index 0000000..611dda5
--- /dev/null
+++ b/doc/Commands/class-use/Login.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.Login</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.Login";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Login.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Login.html" target="_top">Frames</a></li>
+<li><a href="Login.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.Login" class="title">Uses of Class<br>Commands.Login</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.Login</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Login.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Login.html" target="_top">Frames</a></li>
+<li><a href="Login.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/Logout.html b/doc/Commands/class-use/Logout.html
new file mode 100644
index 0000000..59ce5ef
--- /dev/null
+++ b/doc/Commands/class-use/Logout.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.Logout</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.Logout";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Logout.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Logout.html" target="_top">Frames</a></li>
+<li><a href="Logout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.Logout" class="title">Uses of Class<br>Commands.Logout</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.Logout</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/Logout.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/Logout.html" target="_top">Frames</a></li>
+<li><a href="Logout.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/OffDuty.html b/doc/Commands/class-use/OffDuty.html
new file mode 100644
index 0000000..3863192
--- /dev/null
+++ b/doc/Commands/class-use/OffDuty.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.OffDuty</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.OffDuty";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/OffDuty.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/OffDuty.html" target="_top">Frames</a></li>
+<li><a href="OffDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.OffDuty" class="title">Uses of Class<br>Commands.OffDuty</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.OffDuty</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/OffDuty.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/OffDuty.html" target="_top">Frames</a></li>
+<li><a href="OffDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/OnDuty.html b/doc/Commands/class-use/OnDuty.html
new file mode 100644
index 0000000..2625b3d
--- /dev/null
+++ b/doc/Commands/class-use/OnDuty.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.OnDuty</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.OnDuty";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/OnDuty.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/OnDuty.html" target="_top">Frames</a></li>
+<li><a href="OnDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.OnDuty" class="title">Uses of Class<br>Commands.OnDuty</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.OnDuty</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/OnDuty.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/OnDuty.html" target="_top">Frames</a></li>
+<li><a href="OnDuty.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RegisterCourier.html b/doc/Commands/class-use/RegisterCourier.html
new file mode 100644
index 0000000..8b44c5c
--- /dev/null
+++ b/doc/Commands/class-use/RegisterCourier.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RegisterCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RegisterCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterCourier.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterCourier.html" target="_top">Frames</a></li>
+<li><a href="RegisterCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RegisterCourier" class="title">Uses of Class<br>Commands.RegisterCourier</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RegisterCourier</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterCourier.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterCourier.html" target="_top">Frames</a></li>
+<li><a href="RegisterCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RegisterCustomer.html b/doc/Commands/class-use/RegisterCustomer.html
new file mode 100644
index 0000000..e3b6f38
--- /dev/null
+++ b/doc/Commands/class-use/RegisterCustomer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RegisterCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RegisterCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterCustomer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterCustomer.html" target="_top">Frames</a></li>
+<li><a href="RegisterCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RegisterCustomer" class="title">Uses of Class<br>Commands.RegisterCustomer</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RegisterCustomer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterCustomer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterCustomer.html" target="_top">Frames</a></li>
+<li><a href="RegisterCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RegisterManager.html b/doc/Commands/class-use/RegisterManager.html
new file mode 100644
index 0000000..cb960eb
--- /dev/null
+++ b/doc/Commands/class-use/RegisterManager.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RegisterManager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RegisterManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterManager.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterManager.html" target="_top">Frames</a></li>
+<li><a href="RegisterManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RegisterManager" class="title">Uses of Class<br>Commands.RegisterManager</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RegisterManager</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterManager.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterManager.html" target="_top">Frames</a></li>
+<li><a href="RegisterManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RegisterRestaurant.html b/doc/Commands/class-use/RegisterRestaurant.html
new file mode 100644
index 0000000..831282c
--- /dev/null
+++ b/doc/Commands/class-use/RegisterRestaurant.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RegisterRestaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RegisterRestaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterRestaurant.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterRestaurant.html" target="_top">Frames</a></li>
+<li><a href="RegisterRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RegisterRestaurant" class="title">Uses of Class<br>Commands.RegisterRestaurant</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RegisterRestaurant</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RegisterRestaurant.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RegisterRestaurant.html" target="_top">Frames</a></li>
+<li><a href="RegisterRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RemoveSpecialOffer.html b/doc/Commands/class-use/RemoveSpecialOffer.html
new file mode 100644
index 0000000..759c374
--- /dev/null
+++ b/doc/Commands/class-use/RemoveSpecialOffer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RemoveSpecialOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RemoveSpecialOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RemoveSpecialOffer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RemoveSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="RemoveSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RemoveSpecialOffer" class="title">Uses of Class<br>Commands.RemoveSpecialOffer</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RemoveSpecialOffer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RemoveSpecialOffer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RemoveSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="RemoveSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RenameMeal.html b/doc/Commands/class-use/RenameMeal.html
new file mode 100644
index 0000000..9b68c9f
--- /dev/null
+++ b/doc/Commands/class-use/RenameMeal.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RenameMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RenameMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RenameMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RenameMeal.html" target="_top">Frames</a></li>
+<li><a href="RenameMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RenameMeal" class="title">Uses of Class<br>Commands.RenameMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RenameMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RenameMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RenameMeal.html" target="_top">Frames</a></li>
+<li><a href="RenameMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/RunTest.html b/doc/Commands/class-use/RunTest.html
new file mode 100644
index 0000000..2d87957
--- /dev/null
+++ b/doc/Commands/class-use/RunTest.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.RunTest</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.RunTest";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RunTest.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RunTest.html" target="_top">Frames</a></li>
+<li><a href="RunTest.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.RunTest" class="title">Uses of Class<br>Commands.RunTest</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.RunTest</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/RunTest.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/RunTest.html" target="_top">Frames</a></li>
+<li><a href="RunTest.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/SetDeliveryPolicy.html b/doc/Commands/class-use/SetDeliveryPolicy.html
new file mode 100644
index 0000000..c1c5e21
--- /dev/null
+++ b/doc/Commands/class-use/SetDeliveryPolicy.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.SetDeliveryPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.SetDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetDeliveryPolicy.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.SetDeliveryPolicy" class="title">Uses of Class<br>Commands.SetDeliveryPolicy</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.SetDeliveryPolicy</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetDeliveryPolicy.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/SetProfitPolicy.html b/doc/Commands/class-use/SetProfitPolicy.html
new file mode 100644
index 0000000..b378285
--- /dev/null
+++ b/doc/Commands/class-use/SetProfitPolicy.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.SetProfitPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.SetProfitPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetProfitPolicy.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.SetProfitPolicy" class="title">Uses of Class<br>Commands.SetProfitPolicy</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.SetProfitPolicy</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetProfitPolicy.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="SetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/SetSpecialOffer.html b/doc/Commands/class-use/SetSpecialOffer.html
new file mode 100644
index 0000000..f85e1e5
--- /dev/null
+++ b/doc/Commands/class-use/SetSpecialOffer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.SetSpecialOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.SetSpecialOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetSpecialOffer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="SetSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.SetSpecialOffer" class="title">Uses of Class<br>Commands.SetSpecialOffer</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.SetSpecialOffer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/SetSpecialOffer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/SetSpecialOffer.html" target="_top">Frames</a></li>
+<li><a href="SetSpecialOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowCourier.html b/doc/Commands/class-use/ShowCourier.html
new file mode 100644
index 0000000..8d768e1
--- /dev/null
+++ b/doc/Commands/class-use/ShowCourier.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCourier.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCourier.html" target="_top">Frames</a></li>
+<li><a href="ShowCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowCourier" class="title">Uses of Class<br>Commands.ShowCourier</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowCourier</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCourier.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCourier.html" target="_top">Frames</a></li>
+<li><a href="ShowCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowCourierOrdered.html b/doc/Commands/class-use/ShowCourierOrdered.html
new file mode 100644
index 0000000..b9c79f3
--- /dev/null
+++ b/doc/Commands/class-use/ShowCourierOrdered.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowCourierOrdered</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowCourierOrdered";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCourierOrdered.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCourierOrdered.html" target="_top">Frames</a></li>
+<li><a href="ShowCourierOrdered.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowCourierOrdered" class="title">Uses of Class<br>Commands.ShowCourierOrdered</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowCourierOrdered</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCourierOrdered.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCourierOrdered.html" target="_top">Frames</a></li>
+<li><a href="ShowCourierOrdered.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowCustomer.html b/doc/Commands/class-use/ShowCustomer.html
new file mode 100644
index 0000000..86d4d98
--- /dev/null
+++ b/doc/Commands/class-use/ShowCustomer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCustomer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCustomer.html" target="_top">Frames</a></li>
+<li><a href="ShowCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowCustomer" class="title">Uses of Class<br>Commands.ShowCustomer</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowCustomer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowCustomer.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowCustomer.html" target="_top">Frames</a></li>
+<li><a href="ShowCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowMeal.html b/doc/Commands/class-use/ShowMeal.html
new file mode 100644
index 0000000..1d9787f
--- /dev/null
+++ b/doc/Commands/class-use/ShowMeal.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowMeal.html" target="_top">Frames</a></li>
+<li><a href="ShowMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowMeal" class="title">Uses of Class<br>Commands.ShowMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowMeal.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowMeal.html" target="_top">Frames</a></li>
+<li><a href="ShowMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowMenuItem.html b/doc/Commands/class-use/ShowMenuItem.html
new file mode 100644
index 0000000..02ede60
--- /dev/null
+++ b/doc/Commands/class-use/ShowMenuItem.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowMenuItem</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowMenuItem";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowMenuItem.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowMenuItem.html" target="_top">Frames</a></li>
+<li><a href="ShowMenuItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowMenuItem" class="title">Uses of Class<br>Commands.ShowMenuItem</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowMenuItem</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowMenuItem.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowMenuItem.html" target="_top">Frames</a></li>
+<li><a href="ShowMenuItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowProfitBetween.html b/doc/Commands/class-use/ShowProfitBetween.html
new file mode 100644
index 0000000..d221330
--- /dev/null
+++ b/doc/Commands/class-use/ShowProfitBetween.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowProfitBetween</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowProfitBetween";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowProfitBetween.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowProfitBetween.html" target="_top">Frames</a></li>
+<li><a href="ShowProfitBetween.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowProfitBetween" class="title">Uses of Class<br>Commands.ShowProfitBetween</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowProfitBetween</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowProfitBetween.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowProfitBetween.html" target="_top">Frames</a></li>
+<li><a href="ShowProfitBetween.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowRestaurantTop.html b/doc/Commands/class-use/ShowRestaurantTop.html
new file mode 100644
index 0000000..2a8476a
--- /dev/null
+++ b/doc/Commands/class-use/ShowRestaurantTop.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowRestaurantTop</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowRestaurantTop";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowRestaurantTop.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowRestaurantTop.html" target="_top">Frames</a></li>
+<li><a href="ShowRestaurantTop.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowRestaurantTop" class="title">Uses of Class<br>Commands.ShowRestaurantTop</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowRestaurantTop</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowRestaurantTop.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowRestaurantTop.html" target="_top">Frames</a></li>
+<li><a href="ShowRestaurantTop.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/class-use/ShowTotalProfit.html b/doc/Commands/class-use/ShowTotalProfit.html
new file mode 100644
index 0000000..096ba71
--- /dev/null
+++ b/doc/Commands/class-use/ShowTotalProfit.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Commands.ShowTotalProfit</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Commands.ShowTotalProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowTotalProfit.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowTotalProfit.html" target="_top">Frames</a></li>
+<li><a href="ShowTotalProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Commands.ShowTotalProfit" class="title">Uses of Class<br>Commands.ShowTotalProfit</h2>
+</div>
+<div class="classUseContainer">No usage of Commands.ShowTotalProfit</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Commands/ShowTotalProfit.html" title="class in Commands">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Commands/class-use/ShowTotalProfit.html" target="_top">Frames</a></li>
+<li><a href="ShowTotalProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/package-frame.html b/doc/Commands/package-frame.html
new file mode 100644
index 0000000..61d60ad
--- /dev/null
+++ b/doc/Commands/package-frame.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Commands</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Commands/package-summary.html" target="classFrame">Commands</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="AddDishRestaurantMenu.html" title="class in Commands" target="classFrame">AddDishRestaurantMenu</a></li>
+<li><a href="AddDishToMeal.html" title="class in Commands" target="classFrame">AddDishToMeal</a></li>
+<li><a href="AddItemToOrder.html" title="class in Commands" target="classFrame">AddItemToOrder</a></li>
+<li><a href="AssociateCard.html" title="class in Commands" target="classFrame">AssociateCard</a></li>
+<li><a href="CreateMeal.html" title="class in Commands" target="classFrame">CreateMeal</a></li>
+<li><a href="CreateOrder.html" title="class in Commands" target="classFrame">CreateOrder</a></li>
+<li><a href="EndOrder.html" title="class in Commands" target="classFrame">EndOrder</a></li>
+<li><a href="EndOrderAt.html" title="class in Commands" target="classFrame">EndOrderAt</a></li>
+<li><a href="FindDeliverer.html" title="class in Commands" target="classFrame">FindDeliverer</a></li>
+<li><a href="Help.html" title="class in Commands" target="classFrame">Help</a></li>
+<li><a href="Login.html" title="class in Commands" target="classFrame">Login</a></li>
+<li><a href="Logout.html" title="class in Commands" target="classFrame">Logout</a></li>
+<li><a href="OffDuty.html" title="class in Commands" target="classFrame">OffDuty</a></li>
+<li><a href="OnDuty.html" title="class in Commands" target="classFrame">OnDuty</a></li>
+<li><a href="RegisterCourier.html" title="class in Commands" target="classFrame">RegisterCourier</a></li>
+<li><a href="RegisterCustomer.html" title="class in Commands" target="classFrame">RegisterCustomer</a></li>
+<li><a href="RegisterManager.html" title="class in Commands" target="classFrame">RegisterManager</a></li>
+<li><a href="RegisterRestaurant.html" title="class in Commands" target="classFrame">RegisterRestaurant</a></li>
+<li><a href="RemoveSpecialOffer.html" title="class in Commands" target="classFrame">RemoveSpecialOffer</a></li>
+<li><a href="RenameMeal.html" title="class in Commands" target="classFrame">RenameMeal</a></li>
+<li><a href="RunTest.html" title="class in Commands" target="classFrame">RunTest</a></li>
+<li><a href="SetDeliveryPolicy.html" title="class in Commands" target="classFrame">SetDeliveryPolicy</a></li>
+<li><a href="SetProfitPolicy.html" title="class in Commands" target="classFrame">SetProfitPolicy</a></li>
+<li><a href="SetSpecialOffer.html" title="class in Commands" target="classFrame">SetSpecialOffer</a></li>
+<li><a href="ShowCourier.html" title="class in Commands" target="classFrame">ShowCourier</a></li>
+<li><a href="ShowCourierOrdered.html" title="class in Commands" target="classFrame">ShowCourierOrdered</a></li>
+<li><a href="ShowCustomer.html" title="class in Commands" target="classFrame">ShowCustomer</a></li>
+<li><a href="ShowMeal.html" title="class in Commands" target="classFrame">ShowMeal</a></li>
+<li><a href="ShowMenuItem.html" title="class in Commands" target="classFrame">ShowMenuItem</a></li>
+<li><a href="ShowProfitBetween.html" title="class in Commands" target="classFrame">ShowProfitBetween</a></li>
+<li><a href="ShowRestaurantTop.html" title="class in Commands" target="classFrame">ShowRestaurantTop</a></li>
+<li><a href="ShowTotalProfit.html" title="class in Commands" target="classFrame">ShowTotalProfit</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Commands/package-summary.html b/doc/Commands/package-summary.html
new file mode 100644
index 0000000..979b8f3
--- /dev/null
+++ b/doc/Commands/package-summary.html
@@ -0,0 +1,266 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Commands</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Commands";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Core/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Commands</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/AssociateCard.html" title="class in Commands">AssociateCard</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/CreateMeal.html" title="class in Commands">CreateMeal</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/CreateOrder.html" title="class in Commands">CreateOrder</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/EndOrder.html" title="class in Commands">EndOrder</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/Help.html" title="class in Commands">Help</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/Login.html" title="class in Commands">Login</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/Logout.html" title="class in Commands">Logout</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/OffDuty.html" title="class in Commands">OffDuty</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/OnDuty.html" title="class in Commands">OnDuty</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/RegisterManager.html" title="class in Commands">RegisterManager</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/RenameMeal.html" title="class in Commands">RenameMeal</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/RunTest.html" title="class in Commands">RunTest</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/ShowCourier.html" title="class in Commands">ShowCourier</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/ShowMeal.html" title="class in Commands">ShowMeal</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Core/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/package-tree.html b/doc/Commands/package-tree.html
new file mode 100644
index 0000000..1142fd7
--- /dev/null
+++ b/doc/Commands/package-tree.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Commands Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Commands Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/package-tree.html">Prev</a></li>
+<li><a href="../Core/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Commands</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Cli.<a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Command</span></a>
+<ul>
+<li type="circle">Commands.<a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands"><span class="typeNameLink">AddDishRestaurantMenu</span></a></li>
+<li type="circle">Commands.<a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">AddDishToMeal</span></a></li>
+<li type="circle">Commands.<a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">AddItemToOrder</span></a></li>
+<li type="circle">Commands.<a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">AssociateCard</span></a></li>
+<li type="circle">Commands.<a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">CreateMeal</span></a></li>
+<li type="circle">Commands.<a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">CreateOrder</span></a></li>
+<li type="circle">Commands.<a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">EndOrder</span></a></li>
+<li type="circle">Commands.<a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">EndOrderAt</span></a></li>
+<li type="circle">Commands.<a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">FindDeliverer</span></a></li>
+<li type="circle">Commands.<a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Help</span></a></li>
+<li type="circle">Commands.<a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Login</span></a></li>
+<li type="circle">Commands.<a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Logout</span></a></li>
+<li type="circle">Commands.<a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">OffDuty</span></a></li>
+<li type="circle">Commands.<a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">OnDuty</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">RegisterCourier</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">RegisterCustomer</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">RegisterManager</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">RegisterRestaurant</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">RemoveSpecialOffer</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">RenameMeal</span></a></li>
+<li type="circle">Commands.<a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">RunTest</span></a></li>
+<li type="circle">Commands.<a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">SetDeliveryPolicy</span></a></li>
+<li type="circle">Commands.<a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">SetProfitPolicy</span></a></li>
+<li type="circle">Commands.<a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">SetSpecialOffer</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">ShowCourier</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">ShowCourierOrdered</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">ShowCustomer</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">ShowMeal</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">ShowMenuItem</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">ShowProfitBetween</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">ShowRestaurantTop</span></a></li>
+<li type="circle">Commands.<a href="../Commands/ShowTotalProfit.html" title="class in Commands"><span class="typeNameLink">ShowTotalProfit</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Cli/package-tree.html">Prev</a></li>
+<li><a href="../Core/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Commands/package-use.html b/doc/Commands/package-use.html
new file mode 100644
index 0000000..4611cab
--- /dev/null
+++ b/doc/Commands/package-use.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Commands</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Commands";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Commands" class="title">Uses of Package<br>Commands</h1>
+</div>
+<div class="contentContainer">No usage of Commands</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Commands/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/ActiveUserContext.html b/doc/Core/ActiveUserContext.html
index f9b17f5..a461fe9 100644
--- a/doc/Core/ActiveUserContext.html
+++ b/doc/Core/ActiveUserContext.html
@@ -1,284 +1,291 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>ActiveUserContext</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActiveUserContext";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ActiveUserContext.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/ActiveUserContext.html" target="_top">Frames</a></li>
-<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Core</div>
-<h2 title="Class ActiveUserContext" class="title">Class ActiveUserContext</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Core.ActiveUserContext</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ActiveUserContext</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#getUser--">getUser</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ActiveUserContext-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ActiveUserContext</h4>
-<pre>public&nbsp;ActiveUserContext(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getUser--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getUser</h4>
-<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUser()</pre>
-</li>
-</ul>
-<a name="setActiveUser-User.User-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setActiveUser</h4>
-<pre>public&nbsp;void&nbsp;setActiveUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ActiveUserContext.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/ActiveUserContext.html" target="_top">Frames</a></li>
-<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>ActiveUserContext</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ActiveUserContext";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ActiveUserContext.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/ActiveUserContext.html" target="_top">Frames</a></li>
+<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Core</div>
+<h2 title="Class ActiveUserContext" class="title">Class ActiveUserContext</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Core.ActiveUserContext</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ActiveUserContext</span>
+extends java.lang.Object</pre>
+<div class="block">A session Class, it allow the user to be plugged to the Clui and not IN the Clui.
+ When a login is done, the activeUser value is the user logged, which allow commands to
+ affect himself. It also allow to check if the user is granted to execute the task.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#getUser--">getUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ActiveUserContext-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ActiveUserContext</h4>
+<pre>public&nbsp;ActiveUserContext(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUser</h4>
+<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUser()</pre>
+</li>
+</ul>
+<a name="setActiveUser-User.User-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setActiveUser</h4>
+<pre>public&nbsp;void&nbsp;setActiveUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ActiveUserContext.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/ActiveUserContext.html" target="_top">Frames</a></li>
+<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/ContextStrategy.html b/doc/Core/ContextStrategy.html
index 4a1e4a3..4c179af 100644
--- a/doc/Core/ContextStrategy.html
+++ b/doc/Core/ContextStrategy.html
@@ -1,245 +1,230 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>ContextStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ContextStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/ContextStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Core</div>
-<h2 title="Interface ContextStrategy" class="title">Interface ContextStrategy</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">ContextStrategy</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ContextStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="setStrategy-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setStrategy</h4>
-<pre>void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
-          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="execute-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>execute</h4>
-<pre>void&nbsp;execute(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-             double&nbsp;targetProfit)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/ContextStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>ContextStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ContextStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/ContextStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Core</div>
+<h2 title="Interface ContextStrategy" class="title">Interface ContextStrategy</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>, <a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">ContextStrategy</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setStrategy</h4>
+<pre>void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
+          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/ContextStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/Main.html b/doc/Core/Main.html
new file mode 100644
index 0000000..de96245
--- /dev/null
+++ b/doc/Core/Main.html
@@ -0,0 +1,277 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Main</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Main";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Main.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/Main.html" target="_top">Frames</a></li>
+<li><a href="Main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Core</div>
+<h2 title="Class Main" class="title">Class Main</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Core.Main</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Main</span>
+extends java.lang.Object</pre>
+<div class="block">Initialize the Foodora System, the Clui and the activeUserContext.
+ We may have as many Main instance as we want to.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Core/Main.html#Main--">Main</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/Main.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Main--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Main</h4>
+<pre>public&nbsp;Main()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="main-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Main.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/Main.html" target="_top">Frames</a></li>
+<li><a href="Main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/MyFoodora.html b/doc/Core/MyFoodora.html
index 3749b6d..5e10343 100644
--- a/doc/Core/MyFoodora.html
+++ b/doc/Core/MyFoodora.html
@@ -1,817 +1,888 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>MyFoodora</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MyFoodora";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":9,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MyFoodora.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/MyFoodora.html" target="_top">Frames</a></li>
-<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Core</div>
-<h2 title="Class MyFoodora" class="title">Class MyFoodora</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Core.MyFoodora</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MyFoodora</span>
-extends java.lang.Object</pre>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#COURIER">COURIER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#MyFoodora--">MyFoodora</a></span>()</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCourier-User.Courier-">addCourier</a></span>(<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer</a></span>(<a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addManager-User.Manager-">addManager</a></span>(<a href="../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addUser-User.User-">addUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getDeliveryCost--">getDeliveryCost</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getLastMonthIncome--">getLastMonthIncome</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i15" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getMarkupPercentage--">getMarkupPercentage</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getNumberOfOrder--">getNumberOfOrder</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getServiceFee--">getServiceFee</a></span>()</code>
-<div class="block">GENERIC GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i18" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getTotalIncome--">getTotalIncome</a></span>()</code>
-<div class="block">CUSTOM GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i19" class="rowColor">
-<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;usernameTest,
-              java.lang.String&nbsp;passwordTest)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr id="i20" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i21" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#removeWithID-int-long-">removeWithID</a></span>(int&nbsp;typeOfUser,
-            long&nbsp;id)</code>&nbsp;</td>
-</tr>
-<tr id="i22" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy</a></span>(<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</code>&nbsp;</td>
-</tr>
-<tr id="i23" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy</a></span>(<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</code>&nbsp;</td>
-</tr>
-<tr id="i24" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setDeliveryCost-double-">setDeliveryCost</a></span>(double&nbsp;deliveryCost)</code>&nbsp;</td>
-</tr>
-<tr id="i25" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
-</tr>
-<tr id="i26" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
-</tr>
-<tr id="i27" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
-</tr>
-<tr id="i28" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
-</tr>
-<tr id="i29" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
-</tr>
-<tr id="i30" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setMarkupPercentage-double-">setMarkupPercentage</a></span>(double&nbsp;markupPercentage)</code>&nbsp;</td>
-</tr>
-<tr id="i31" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setServiceFee-double-">setServiceFee</a></span>(double&nbsp;serviceFee)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="UNKNOWN">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UNKNOWN</h4>
-<pre>public static final&nbsp;int UNKNOWN</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#Core.MyFoodora.UNKNOWN">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="COURIER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>COURIER</h4>
-<pre>public static final&nbsp;int COURIER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#Core.MyFoodora.COURIER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="RESTAURANT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>RESTAURANT</h4>
-<pre>public static final&nbsp;int RESTAURANT</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#Core.MyFoodora.RESTAURANT">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CUSTOMER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CUSTOMER</h4>
-<pre>public static final&nbsp;int CUSTOMER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#Core.MyFoodora.CUSTOMER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MANAGER">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MANAGER</h4>
-<pre>public static final&nbsp;int MANAGER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#Core.MyFoodora.MANAGER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MyFoodora--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MyFoodora</h4>
-<pre>public&nbsp;MyFoodora()
-          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<div class="block">CONSTRUCTOR</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getUserByLogin-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getUserByLogin</h4>
-<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByLogin(java.lang.String&nbsp;usernameTest,
-                           java.lang.String&nbsp;passwordTest)</pre>
-<div class="block">CUSTOM</div>
-</li>
-</ul>
-<a name="addUser-User.User-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addUser</h4>
-<pre>public&nbsp;void&nbsp;addUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
-</li>
-</ul>
-<a name="addCustomer-User.Customer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addCustomer</h4>
-<pre>public&nbsp;void&nbsp;addCustomer(<a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</pre>
-</li>
-</ul>
-<a name="addRestaurant-User.Restaurant-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addRestaurant</h4>
-<pre>public&nbsp;void&nbsp;addRestaurant(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
-</li>
-</ul>
-<a name="addCourier-User.Courier-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addCourier</h4>
-<pre>public&nbsp;void&nbsp;addCourier(<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</pre>
-</li>
-</ul>
-<a name="addManager-User.Manager-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addManager</h4>
-<pre>public&nbsp;void&nbsp;addManager(<a href="../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</pre>
-</li>
-</ul>
-<a name="removeWithID-int-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeWithID</h4>
-<pre>public&nbsp;void&nbsp;removeWithID(int&nbsp;typeOfUser,
-                         long&nbsp;id)</pre>
-</li>
-</ul>
-<a name="getTotalIncome--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTotalIncome</h4>
-<pre>public&nbsp;double&nbsp;getTotalIncome()</pre>
-<div class="block">CUSTOM GETTER AND SETTER</div>
-</li>
-</ul>
-<a name="getServiceFee--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getServiceFee</h4>
-<pre>public&nbsp;double&nbsp;getServiceFee()</pre>
-<div class="block">GENERIC GETTER AND SETTER</div>
-</li>
-</ul>
-<a name="getGlobalListUser--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getGlobalListUser</h4>
-<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;getGlobalListUser()</pre>
-</li>
-</ul>
-<a name="setGlobalListUser-User.ListUser-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setGlobalListUser</h4>
-<pre>public&nbsp;void&nbsp;setGlobalListUser(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</pre>
-</li>
-</ul>
-<a name="setListRestaurant-User.ListUser-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setListRestaurant</h4>
-<pre>public&nbsp;void&nbsp;setListRestaurant(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</pre>
-</li>
-</ul>
-<a name="setListCustomer-User.ListUser-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setListCustomer</h4>
-<pre>public&nbsp;void&nbsp;setListCustomer(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</pre>
-</li>
-</ul>
-<a name="setListManager-User.ListUser-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setListManager</h4>
-<pre>public&nbsp;void&nbsp;setListManager(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</pre>
-</li>
-</ul>
-<a name="getListRestaurant--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListRestaurant</h4>
-<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;getListRestaurant()</pre>
-</li>
-</ul>
-<a name="getListCustomer--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListCustomer</h4>
-<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;getListCustomer()</pre>
-</li>
-</ul>
-<a name="getListManager--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListManager</h4>
-<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;getListManager()</pre>
-</li>
-</ul>
-<a name="getListCourier--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListCourier</h4>
-<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;getListCourier()</pre>
-</li>
-</ul>
-<a name="getGlobalHistoric--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getGlobalHistoric</h4>
-<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getGlobalHistoric()</pre>
-</li>
-</ul>
-<a name="getContextTargetProfitStrategy--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getContextTargetProfitStrategy</h4>
-<pre>public&nbsp;<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;getContextTargetProfitStrategy()</pre>
-</li>
-</ul>
-<a name="getContextDeliveryPolicy--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getContextDeliveryPolicy</h4>
-<pre>public&nbsp;<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;getContextDeliveryPolicy()</pre>
-</li>
-</ul>
-<a name="setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setContextTargetProfitStrategy</h4>
-<pre>public&nbsp;void&nbsp;setContextTargetProfitStrategy(<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</pre>
-</li>
-</ul>
-<a name="setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setContextDeliveryPolicy</h4>
-<pre>public&nbsp;void&nbsp;setContextDeliveryPolicy(<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</pre>
-</li>
-</ul>
-<a name="setListCourier-User.ListUser-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setListCourier</h4>
-<pre>public&nbsp;void&nbsp;setListCourier(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</pre>
-</li>
-</ul>
-<a name="setServiceFee-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setServiceFee</h4>
-<pre>public&nbsp;void&nbsp;setServiceFee(double&nbsp;serviceFee)</pre>
-</li>
-</ul>
-<a name="getMarkupPercentage--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMarkupPercentage</h4>
-<pre>public&nbsp;double&nbsp;getMarkupPercentage()</pre>
-</li>
-</ul>
-<a name="setMarkupPercentage-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setMarkupPercentage</h4>
-<pre>public&nbsp;void&nbsp;setMarkupPercentage(double&nbsp;markupPercentage)</pre>
-</li>
-</ul>
-<a name="getDeliveryCost--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getDeliveryCost</h4>
-<pre>public&nbsp;double&nbsp;getDeliveryCost()</pre>
-</li>
-</ul>
-<a name="setDeliveryCost-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDeliveryCost</h4>
-<pre>public&nbsp;void&nbsp;setDeliveryCost(double&nbsp;deliveryCost)</pre>
-</li>
-</ul>
-<a name="main-java.lang.String:A-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)
-                 throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
-                        <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
-                        <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
-<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getLastMonthIncome--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLastMonthIncome</h4>
-<pre>public&nbsp;double&nbsp;getLastMonthIncome()</pre>
-</li>
-</ul>
-<a name="getNumberOfOrder--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getNumberOfOrder</h4>
-<pre>public&nbsp;int&nbsp;getNumberOfOrder()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MyFoodora.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/MyFoodora.html" target="_top">Frames</a></li>
-<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>MyFoodora</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MyFoodora";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MyFoodora.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/MyFoodora.html" target="_top">Frames</a></li>
+<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Core</div>
+<h2 title="Class MyFoodora" class="title">Class MyFoodora</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Core.MyFoodora</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MyFoodora</span>
+extends java.lang.Object</pre>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have. This class should be unique and contain the entire foodora system.
+ It also implement a lot of method which allow users to modify itself.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#MyFoodora--">MyFoodora</a></span>()</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCourier-User.Courier-">addCourier</a></span>(<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer</a></span>(<a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addManager-User.Manager-">addManager</a></span>(<a href="../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#addUser-User.User-">addUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../User/Customer.html" title="class in User">Customer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getCustomerByOrder-Order.Order-">getCustomerByOrder</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getDeliveryCost--">getDeliveryCost</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalProfit--">getGlobalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getLastMonthIncome--">getLastMonthIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourierOrdered-java.lang.String-">getListCourierOrdered</a></span>(java.lang.String&nbsp;type)</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getMarkupPercentage--">getMarkupPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getNumberOfOrderLastMonth--">getNumberOfOrderLastMonth</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getOrderPendingList--">getOrderPendingList</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code><a href="../Order/Order.html" title="class in Order">Order</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getPendingOrderByName-java.lang.String-">getPendingOrderByName</a></span>(java.lang.String&nbsp;string)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getProfitBetween-Others.Date-Others.Date-">getProfitBetween</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;dateBeg,
+                <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;dateEnd)</code>&nbsp;</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getServiceFee--">getServiceFee</a></span>()</code>
+<div class="block">GENERIC GETTER AND SETTER</div>
+</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;usernameTest,
+              java.lang.String&nbsp;passwordTest)</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByName-java.lang.String-java.lang.String-">getUserByName</a></span>(java.lang.String&nbsp;username,
+             java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByUsername-java.lang.String-">getUserByUsername</a></span>(java.lang.String&nbsp;username)</code>&nbsp;</td>
+</tr>
+<tr id="i27" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#removeWithID-int-long-">removeWithID</a></span>(int&nbsp;typeOfUser,
+            long&nbsp;id)</code>&nbsp;</td>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy</a></span>(<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</code>&nbsp;</td>
+</tr>
+<tr id="i29" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy</a></span>(<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</code>&nbsp;</td>
+</tr>
+<tr id="i30" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setDeliveryCost-double-">setDeliveryCost</a></span>(double&nbsp;deliveryCost)</code>&nbsp;</td>
+</tr>
+<tr id="i31" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
+</tr>
+<tr id="i32" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
+</tr>
+<tr id="i33" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
+</tr>
+<tr id="i34" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
+</tr>
+<tr id="i35" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
+</tr>
+<tr id="i36" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setMarkupPercentage-double-">setMarkupPercentage</a></span>(double&nbsp;markupPercentage)</code>&nbsp;</td>
+</tr>
+<tr id="i37" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Core/MyFoodora.html#setServiceFee-double-">setServiceFee</a></span>(double&nbsp;serviceFee)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#Core.MyFoodora.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#Core.MyFoodora.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#Core.MyFoodora.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#Core.MyFoodora.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#Core.MyFoodora.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MyFoodora--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MyFoodora</h4>
+<pre>public&nbsp;MyFoodora()</pre>
+<div class="block">CONSTRUCTOR</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getUserByLogin-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUserByLogin</h4>
+<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByLogin(java.lang.String&nbsp;usernameTest,
+                           java.lang.String&nbsp;passwordTest)</pre>
+<div class="block">CUSTOM</div>
+</li>
+</ul>
+<a name="getUserByUsername-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUserByUsername</h4>
+<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByUsername(java.lang.String&nbsp;username)</pre>
+</li>
+</ul>
+<a name="getUserByName-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUserByName</h4>
+<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByName(java.lang.String&nbsp;username,
+                          java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="addUser-User.User-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addUser</h4>
+<pre>public&nbsp;void&nbsp;addUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
+</li>
+</ul>
+<a name="addCustomer-User.Customer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addCustomer</h4>
+<pre>public&nbsp;void&nbsp;addCustomer(<a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</pre>
+</li>
+</ul>
+<a name="addRestaurant-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addRestaurant</h4>
+<pre>public&nbsp;void&nbsp;addRestaurant(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
+</li>
+</ul>
+<a name="addCourier-User.Courier-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addCourier</h4>
+<pre>public&nbsp;void&nbsp;addCourier(<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</pre>
+</li>
+</ul>
+<a name="addManager-User.Manager-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addManager</h4>
+<pre>public&nbsp;void&nbsp;addManager(<a href="../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</pre>
+</li>
+</ul>
+<a name="removeWithID-int-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeWithID</h4>
+<pre>public&nbsp;void&nbsp;removeWithID(int&nbsp;typeOfUser,
+                         long&nbsp;id)</pre>
+</li>
+</ul>
+<a name="getServiceFee--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getServiceFee</h4>
+<pre>public&nbsp;double&nbsp;getServiceFee()</pre>
+<div class="block">GENERIC GETTER AND SETTER</div>
+</li>
+</ul>
+<a name="getGlobalListUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGlobalListUser</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;getGlobalListUser()</pre>
+</li>
+</ul>
+<a name="setGlobalListUser-User.ListUser-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setGlobalListUser</h4>
+<pre>public&nbsp;void&nbsp;setGlobalListUser(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</pre>
+</li>
+</ul>
+<a name="setListRestaurant-User.ListUser-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListRestaurant</h4>
+<pre>public&nbsp;void&nbsp;setListRestaurant(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</pre>
+</li>
+</ul>
+<a name="setListCustomer-User.ListUser-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListCustomer</h4>
+<pre>public&nbsp;void&nbsp;setListCustomer(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</pre>
+</li>
+</ul>
+<a name="setListManager-User.ListUser-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListManager</h4>
+<pre>public&nbsp;void&nbsp;setListManager(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</pre>
+</li>
+</ul>
+<a name="getListRestaurant--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListRestaurant</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;getListRestaurant()</pre>
+</li>
+</ul>
+<a name="getListCustomer--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListCustomer</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;getListCustomer()</pre>
+</li>
+</ul>
+<a name="getListManager--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListManager</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;getListManager()</pre>
+</li>
+</ul>
+<a name="getListCourier--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListCourier</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;getListCourier()</pre>
+</li>
+</ul>
+<a name="getListCourierOrdered-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListCourierOrdered</h4>
+<pre>public&nbsp;<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;getListCourierOrdered(java.lang.String&nbsp;type)</pre>
+</li>
+</ul>
+<a name="getGlobalHistoric--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGlobalHistoric</h4>
+<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getGlobalHistoric()</pre>
+</li>
+</ul>
+<a name="getContextTargetProfitStrategy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getContextTargetProfitStrategy</h4>
+<pre>public&nbsp;<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;getContextTargetProfitStrategy()</pre>
+</li>
+</ul>
+<a name="getContextDeliveryPolicy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getContextDeliveryPolicy</h4>
+<pre>public&nbsp;<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;getContextDeliveryPolicy()</pre>
+</li>
+</ul>
+<a name="setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setContextTargetProfitStrategy</h4>
+<pre>public&nbsp;void&nbsp;setContextTargetProfitStrategy(<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</pre>
+</li>
+</ul>
+<a name="setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setContextDeliveryPolicy</h4>
+<pre>public&nbsp;void&nbsp;setContextDeliveryPolicy(<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</pre>
+</li>
+</ul>
+<a name="setListCourier-User.ListUser-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListCourier</h4>
+<pre>public&nbsp;void&nbsp;setListCourier(<a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</pre>
+</li>
+</ul>
+<a name="setServiceFee-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setServiceFee</h4>
+<pre>public&nbsp;void&nbsp;setServiceFee(double&nbsp;serviceFee)</pre>
+</li>
+</ul>
+<a name="getMarkupPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMarkupPercentage</h4>
+<pre>public&nbsp;double&nbsp;getMarkupPercentage()</pre>
+</li>
+</ul>
+<a name="setMarkupPercentage-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMarkupPercentage</h4>
+<pre>public&nbsp;void&nbsp;setMarkupPercentage(double&nbsp;markupPercentage)</pre>
+</li>
+</ul>
+<a name="getDeliveryCost--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeliveryCost</h4>
+<pre>public&nbsp;double&nbsp;getDeliveryCost()</pre>
+</li>
+</ul>
+<a name="setDeliveryCost-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDeliveryCost</h4>
+<pre>public&nbsp;void&nbsp;setDeliveryCost(double&nbsp;deliveryCost)</pre>
+</li>
+</ul>
+<a name="getLastMonthIncome--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLastMonthIncome</h4>
+<pre>public&nbsp;double&nbsp;getLastMonthIncome()</pre>
+</li>
+</ul>
+<a name="getOrderPendingList--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOrderPendingList</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getOrderPendingList()</pre>
+</li>
+</ul>
+<a name="getPendingOrderByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPendingOrderByName</h4>
+<pre>public&nbsp;<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;getPendingOrderByName(java.lang.String&nbsp;string)</pre>
+</li>
+</ul>
+<a name="getCustomerByOrder-Order.Order-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCustomerByOrder</h4>
+<pre>public&nbsp;<a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;getCustomerByOrder(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="getNumberOfOrderLastMonth--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNumberOfOrderLastMonth</h4>
+<pre>public&nbsp;int&nbsp;getNumberOfOrderLastMonth()</pre>
+</li>
+</ul>
+<a name="getGlobalProfit--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGlobalProfit</h4>
+<pre>public&nbsp;double&nbsp;getGlobalProfit()</pre>
+</li>
+</ul>
+<a name="getProfitBetween-Others.Date-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getProfitBetween</h4>
+<pre>public&nbsp;double&nbsp;getProfitBetween(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;dateBeg,
+                               <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;dateEnd)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MyFoodora.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/MyFoodora.html" target="_top">Frames</a></li>
+<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/class-use/ActiveUserContext.html b/doc/Core/class-use/ActiveUserContext.html
index 9db2118..ed25c38 100644
--- a/doc/Core/class-use/ActiveUserContext.html
+++ b/doc/Core/class-use/ActiveUserContext.html
@@ -1,124 +1,388 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Core.ActiveUserContext</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Core.ActiveUserContext";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/ActiveUserContext.html" title="class in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/ActiveUserContext.html" target="_top">Frames</a></li>
-<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Core.ActiveUserContext" class="title">Uses of Class<br>Core.ActiveUserContext</h2>
-</div>
-<div class="classUseContainer">No usage of Core.ActiveUserContext</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/ActiveUserContext.html" title="class in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/ActiveUserContext.html" target="_top">Frames</a></li>
-<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Core.ActiveUserContext</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Core.ActiveUserContext";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/ActiveUserContext.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/ActiveUserContext.html" target="_top">Frames</a></li>
+<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Core.ActiveUserContext" class="title">Uses of Class<br>Core.ActiveUserContext</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cli/Clui.html#Clui-Core.MyFoodora-Core.ActiveUserContext-">Clui</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;_foodora,
+    <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;_activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> with parameters of type <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowTotalProfit.</span><code><span class="memberNameLink"><a href="../../Commands/ShowTotalProfit.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowRestaurantTop.</span><code><span class="memberNameLink"><a href="../../Commands/ShowRestaurantTop.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowProfitBetween.</span><code><span class="memberNameLink"><a href="../../Commands/ShowProfitBetween.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowMenuItem.</span><code><span class="memberNameLink"><a href="../../Commands/ShowMenuItem.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowMeal.</span><code><span class="memberNameLink"><a href="../../Commands/ShowMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCustomer.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCourierOrdered.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCourierOrdered.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCourier.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetSpecialOffer.</span><code><span class="memberNameLink"><a href="../../Commands/SetSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetProfitPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetProfitPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetDeliveryPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RunTest.</span><code><span class="memberNameLink"><a href="../../Commands/RunTest.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RenameMeal.</span><code><span class="memberNameLink"><a href="../../Commands/RenameMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RemoveSpecialOffer.</span><code><span class="memberNameLink"><a href="../../Commands/RemoveSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterRestaurant.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterRestaurant.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterManager.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterManager.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCustomer.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCourier.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">OnDuty.</span><code><span class="memberNameLink"><a href="../../Commands/OnDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">OffDuty.</span><code><span class="memberNameLink"><a href="../../Commands/OffDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Logout.</span><code><span class="memberNameLink"><a href="../../Commands/Logout.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Login.</span><code><span class="memberNameLink"><a href="../../Commands/Login.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;args,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Help.</span><code><span class="memberNameLink"><a href="../../Commands/Help.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">FindDeliverer.</span><code><span class="memberNameLink"><a href="../../Commands/FindDeliverer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">EndOrderAt.</span><code><span class="memberNameLink"><a href="../../Commands/EndOrderAt.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">EndOrder.</span><code><span class="memberNameLink"><a href="../../Commands/EndOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CreateOrder.</span><code><span class="memberNameLink"><a href="../../Commands/CreateOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CreateMeal.</span><code><span class="memberNameLink"><a href="../../Commands/CreateMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AssociateCard.</span><code><span class="memberNameLink"><a href="../../Commands/AssociateCard.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddItemToOrder.</span><code><span class="memberNameLink"><a href="../../Commands/AddItemToOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddDishToMeal.</span><code><span class="memberNameLink"><a href="../../Commands/AddDishToMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddDishRestaurantMenu.</span><code><span class="memberNameLink"><a href="../../Commands/AddDishRestaurantMenu.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/ActiveUserContext.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/ActiveUserContext.html" target="_top">Frames</a></li>
+<li><a href="ActiveUserContext.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/class-use/ContextStrategy.html b/doc/Core/class-use/ContextStrategy.html
index d033db7..cda5dd1 100644
--- a/doc/Core/class-use/ContextStrategy.html
+++ b/doc/Core/class-use/ContextStrategy.html
@@ -1,164 +1,190 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Core.ContextStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Core.ContextStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/ContextStrategy.html" title="interface in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/ContextStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Core.ContextStrategy" class="title">Uses of Interface<br>Core.ContextStrategy</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that implement <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/ContextStrategy.html" title="interface in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/ContextStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Interface Core.ContextStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Core.ContextStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/ContextStrategy.html" title="interface in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/ContextStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Core.ContextStrategy" class="title">Uses of Interface<br>Core.ContextStrategy</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that implement <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span></code>
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that implement <a href="../../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span></code>
+<div class="block">Context of the profit strategy.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/ContextStrategy.html" title="interface in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/ContextStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/class-use/Main.html b/doc/Core/class-use/Main.html
new file mode 100644
index 0000000..7ab1fe8
--- /dev/null
+++ b/doc/Core/class-use/Main.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Core.Main</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Core.Main";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/Main.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/Main.html" target="_top">Frames</a></li>
+<li><a href="Main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Core.Main" class="title">Uses of Class<br>Core.Main</h2>
+</div>
+<div class="classUseContainer">No usage of Core.Main</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/Main.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/Main.html" target="_top">Frames</a></li>
+<li><a href="Main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/class-use/MyFoodora.html b/doc/Core/class-use/MyFoodora.html
index 0e70b36..639ec4c 100644
--- a/doc/Core/class-use/MyFoodora.html
+++ b/doc/Core/class-use/MyFoodora.html
@@ -1,360 +1,622 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Core.MyFoodora</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Core.MyFoodora";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/MyFoodora.html" title="class in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/MyFoodora.html" target="_top">Frames</a></li>
-<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Core.MyFoodora" class="title">Uses of Class<br>Core.MyFoodora</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextStrategy.</span><code><span class="memberNameLink"><a href="../../Core/ContextStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">TargetProfitServiceFee.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">TargetProfitMarkup.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">TargetProfitDeliveryCost.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><span class="typeNameLabel">StrategyTargetProfitPolicy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-            <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname,
-       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-       int&nbsp;typeOfUser,
-       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost</a></span>(double&nbsp;newDeliveryCost,
-                  <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage</a></span>(double&nbsp;newMarkupPercentage,
-                      <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee</a></span>(double&nbsp;newServiceFee,
-                <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-               <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                           <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#login-Core.MyFoodora-">login</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#register-Core.MyFoodora-">register</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u,
-          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                 <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                     <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#unregister-Core.MyFoodora-">unregister</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Core/MyFoodora.html" title="class in Core">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Core/class-use/MyFoodora.html" target="_top">Frames</a></li>
-<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Core.MyFoodora</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Core.MyFoodora";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/MyFoodora.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/MyFoodora.html" target="_top">Frames</a></li>
+<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Core.MyFoodora" class="title">Uses of Class<br>Core.MyFoodora</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Cli/package-summary.html">Cli</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Cli/Clui.html#Clui-Core.MyFoodora-Core.ActiveUserContext-">Clui</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;_foodora,
+    <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;_activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowTotalProfit.</span><code><span class="memberNameLink"><a href="../../Commands/ShowTotalProfit.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowRestaurantTop.</span><code><span class="memberNameLink"><a href="../../Commands/ShowRestaurantTop.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowProfitBetween.</span><code><span class="memberNameLink"><a href="../../Commands/ShowProfitBetween.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowMenuItem.</span><code><span class="memberNameLink"><a href="../../Commands/ShowMenuItem.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowMeal.</span><code><span class="memberNameLink"><a href="../../Commands/ShowMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCustomer.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCourierOrdered.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCourierOrdered.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ShowCourier.</span><code><span class="memberNameLink"><a href="../../Commands/ShowCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetSpecialOffer.</span><code><span class="memberNameLink"><a href="../../Commands/SetSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetProfitPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetProfitPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetDeliveryPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RunTest.</span><code><span class="memberNameLink"><a href="../../Commands/RunTest.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RenameMeal.</span><code><span class="memberNameLink"><a href="../../Commands/RenameMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RemoveSpecialOffer.</span><code><span class="memberNameLink"><a href="../../Commands/RemoveSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterRestaurant.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterRestaurant.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterManager.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterManager.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCustomer.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCourier.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">OnDuty.</span><code><span class="memberNameLink"><a href="../../Commands/OnDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">OffDuty.</span><code><span class="memberNameLink"><a href="../../Commands/OffDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Logout.</span><code><span class="memberNameLink"><a href="../../Commands/Logout.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Login.</span><code><span class="memberNameLink"><a href="../../Commands/Login.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;args,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Help.</span><code><span class="memberNameLink"><a href="../../Commands/Help.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">FindDeliverer.</span><code><span class="memberNameLink"><a href="../../Commands/FindDeliverer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">EndOrderAt.</span><code><span class="memberNameLink"><a href="../../Commands/EndOrderAt.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">EndOrder.</span><code><span class="memberNameLink"><a href="../../Commands/EndOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CreateOrder.</span><code><span class="memberNameLink"><a href="../../Commands/CreateOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CreateMeal.</span><code><span class="memberNameLink"><a href="../../Commands/CreateMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AssociateCard.</span><code><span class="memberNameLink"><a href="../../Commands/AssociateCard.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddItemToOrder.</span><code><span class="memberNameLink"><a href="../../Commands/AddItemToOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddDishToMeal.</span><code><span class="memberNameLink"><a href="../../Commands/AddDishToMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddDishRestaurantMenu.</span><code><span class="memberNameLink"><a href="../../Commands/AddDishRestaurantMenu.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#finalize-Core.MyFoodora-">finalize</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#finalize-Core.MyFoodora-Others.Date-">finalize</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+        <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;_date)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TargetProfitServiceFee.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TargetProfitMarkup.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TargetProfitDeliveryCost.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">StrategyTargetProfitPolicy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+       double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+            <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addMealOfTheWeek-Core.MyFoodora-java.lang.String-">addMealOfTheWeek</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                java.lang.String&nbsp;nameOfMeal)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       int&nbsp;typeOfUser,
+       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost</a></span>(double&nbsp;newDeliveryCost,
+                  <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage</a></span>(double&nbsp;newMarkupPercentage,
+                      <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee</a></span>(double&nbsp;newServiceFee,
+                <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+               <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#executeTargetProfitPolicy-Core.MyFoodora-double-">executeTargetProfitPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                         double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                           <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-">placeOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-Others.Date-">placeOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+          <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-User.Restaurant-java.lang.String-java.util.ArrayList-Core.MyFoodora-">placeOrder</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+          java.lang.String&nbsp;mealOrDish,
+          java.util.ArrayList&lt;java.lang.String&gt;&nbsp;listOfItem,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#register-Core.MyFoodora-">register</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#removeMealOfTheWeek-Core.MyFoodora-">removeMealOfTheWeek</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                 <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                     <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#unregister-Core.MyFoodora-">unregister</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Core/MyFoodora.html" title="class in Core">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Core/class-use/MyFoodora.html" target="_top">Frames</a></li>
+<li><a href="MyFoodora.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/package-frame.html b/doc/Core/package-frame.html
index 466192d..8c9f622 100644
--- a/doc/Core/package-frame.html
+++ b/doc/Core/package-frame.html
@@ -1,25 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Core</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Core/package-summary.html" target="classFrame">Core</a></h1>
-<div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="ContextStrategy.html" title="interface in Core" target="classFrame"><span class="interfaceName">ContextStrategy</span></a></li>
-</ul>
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="ActiveUserContext.html" title="class in Core" target="classFrame">ActiveUserContext</a></li>
-<li><a href="MyFoodora.html" title="class in Core" target="classFrame">MyFoodora</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Core</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Core/package-summary.html" target="classFrame">Core</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="ContextStrategy.html" title="interface in Core" target="classFrame"><span class="interfaceName">ContextStrategy</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ActiveUserContext.html" title="class in Core" target="classFrame">ActiveUserContext</a></li>
+<li><a href="Main.html" title="class in Core" target="classFrame">Main</a></li>
+<li><a href="MyFoodora.html" title="class in Core" target="classFrame">MyFoodora</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Core/package-summary.html b/doc/Core/package-summary.html
index b2dabc1..e82c3d1 100644
--- a/doc/Core/package-summary.html
+++ b/doc/Core/package-summary.html
@@ -1,164 +1,172 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Core</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Core";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../DeliveryStrategy/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Core</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></td>
-<td class="colLast">
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../DeliveryStrategy/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Core</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Core";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../DeliveryStrategy/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Core</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></td>
+<td class="colLast">
+<div class="block">A session Class, it allow the user to be plugged to the Clui and not IN the Clui.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Core/Main.html" title="class in Core">Main</a></td>
+<td class="colLast">
+<div class="block">Initialize the Foodora System, the Clui and the activeUserContext.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></td>
+<td class="colLast">
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../DeliveryStrategy/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/package-tree.html b/doc/Core/package-tree.html
index fc1b4de..20eaf2f 100644
--- a/doc/Core/package-tree.html
+++ b/doc/Core/package-tree.html
@@ -1,142 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Core Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Core Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/package-tree.html">Prev</a></li>
-<li><a href="../DeliveryStrategy/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Core</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Core.<a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a></li>
-<li type="circle">Core.<a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a></li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">Core.<a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Cli/package-tree.html">Prev</a></li>
-<li><a href="../DeliveryStrategy/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Core Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Core Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/package-tree.html">Prev</a></li>
+<li><a href="../DeliveryStrategy/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Core</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Core.<a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a></li>
+<li type="circle">Core.<a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Main</span></a></li>
+<li type="circle">Core.<a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">Core.<a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Commands/package-tree.html">Prev</a></li>
+<li><a href="../DeliveryStrategy/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Core/package-use.html b/doc/Core/package-use.html
index 7a25c9c..a9aa69d 100644
--- a/doc/Core/package-use.html
+++ b/doc/Core/package-use.html
@@ -1,229 +1,302 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Core</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Core";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Core" class="title">Uses of Package<br>Core</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Core/class-use/MyFoodora.html#Core">MyFoodora</a>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Core/class-use/ContextStrategy.html#DeliveryStrategy">ContextStrategy</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Core/class-use/MyFoodora.html#DeliveryStrategy">MyFoodora</a>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Core/class-use/MyFoodora.html#StrategyProfit">MyFoodora</a>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Core/class-use/MyFoodora.html#User">MyFoodora</a>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Core/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Core</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Core";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Core" class="title">Uses of Package<br>Core</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../Cli/package-summary.html">Cli</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/ActiveUserContext.html#Cli">ActiveUserContext</a>
+<div class="block">A session Class, it allow the user to be plugged to the Clui and not IN the Clui.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#Cli">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../Commands/package-summary.html">Commands</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/ActiveUserContext.html#Commands">ActiveUserContext</a>
+<div class="block">A session Class, it allow the user to be plugged to the Clui and not IN the Clui.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#Commands">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#Core">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/ContextStrategy.html#DeliveryStrategy">ContextStrategy</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#Order">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/ContextStrategy.html#StrategyProfit">ContextStrategy</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#StrategyProfit">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Core/package-summary.html">Core</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Core/class-use/MyFoodora.html#User">MyFoodora</a>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Core/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/ContextDeliveryStrategy.html b/doc/DeliveryStrategy/ContextDeliveryStrategy.html
index 76567b4..fa3ad57 100644
--- a/doc/DeliveryStrategy/ContextDeliveryStrategy.html
+++ b/doc/DeliveryStrategy/ContextDeliveryStrategy.html
@@ -1,307 +1,336 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ContextDeliveryStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ContextDeliveryStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextDeliveryStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">DeliveryStrategy</div>
-<h2 title="Class ContextDeliveryStrategy" class="title">Class ContextDeliveryStrategy</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>DeliveryStrategy.ContextDeliveryStrategy</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ContextDeliveryStrategy</span>
-extends java.lang.Object
-implements <a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ContextDeliveryStrategy-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ContextDeliveryStrategy</h4>
-<pre>public&nbsp;ContextDeliveryStrategy(java.lang.String&nbsp;strategyName)
-                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="setStrategy-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setStrategy</h4>
-<pre>public&nbsp;void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
-                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></code>&nbsp;in interface&nbsp;<code><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="execute-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>execute</h4>
-<pre>public&nbsp;void&nbsp;execute(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                    double&nbsp;targetProfit)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Core/ContextStrategy.html#execute-Core.MyFoodora-double-">execute</a></code>&nbsp;in interface&nbsp;<code><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextDeliveryStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>ContextDeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ContextDeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextDeliveryStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">DeliveryStrategy</div>
+<h2 title="Class ContextDeliveryStrategy" class="title">Class ContextDeliveryStrategy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>DeliveryStrategy.ContextDeliveryStrategy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ContextDeliveryStrategy</span>
+extends java.lang.Object
+implements <a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></pre>
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#getStrategy--">getStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-DeliveryStrategy.StrategyDeliveryPolicy-">setStrategy</a></span>(<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a>&nbsp;strategy)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ContextDeliveryStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ContextDeliveryStrategy</h4>
+<pre>public&nbsp;ContextDeliveryStrategy(java.lang.String&nbsp;strategyName)
+                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setStrategy</h4>
+<pre>public&nbsp;void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
+                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></code>&nbsp;in interface&nbsp;<code><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getStrategy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStrategy</h4>
+<pre>public&nbsp;<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a>&nbsp;getStrategy()</pre>
+</li>
+</ul>
+<a name="setStrategy-DeliveryStrategy.StrategyDeliveryPolicy-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setStrategy</h4>
+<pre>public&nbsp;void&nbsp;setStrategy(<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a>&nbsp;strategy)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextDeliveryStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/FairOccupationDelivery.html b/doc/DeliveryStrategy/FairOccupationDelivery.html
index 25a3e98..4fd1050 100644
--- a/doc/DeliveryStrategy/FairOccupationDelivery.html
+++ b/doc/DeliveryStrategy/FairOccupationDelivery.html
@@ -1,280 +1,296 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>FairOccupationDelivery</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FairOccupationDelivery";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FairOccupationDelivery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/FairOccupationDelivery.html" target="_top">Frames</a></li>
-<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">DeliveryStrategy</div>
-<h2 title="Class FairOccupationDelivery" class="title">Class FairOccupationDelivery</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>DeliveryStrategy.FairOccupationDelivery</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FairOccupationDelivery</span>
-extends java.lang.Object
-implements <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#FairOccupationDelivery--">FairOccupationDelivery</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FairOccupationDelivery--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FairOccupationDelivery</h4>
-<pre>public&nbsp;FairOccupationDelivery()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseCourier-java.util.ArrayList-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseCourier</h4>
-<pre>public&nbsp;void&nbsp;chooseCourier(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></code>&nbsp;in interface&nbsp;<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FairOccupationDelivery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/FairOccupationDelivery.html" target="_top">Frames</a></li>
-<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>FairOccupationDelivery</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FairOccupationDelivery";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FairOccupationDelivery.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/FairOccupationDelivery.html" target="_top">Frames</a></li>
+<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">DeliveryStrategy</div>
+<h2 title="Class FairOccupationDelivery" class="title">Class FairOccupationDelivery</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">DeliveryStrategy.StrategyDeliveryPolicy</a></li>
+<li>
+<ul class="inheritance">
+<li>DeliveryStrategy.FairOccupationDelivery</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FairOccupationDelivery</span>
+extends <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></pre>
+<div class="block">Tend to give equally orders to all Couriers.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#FairOccupationDelivery--">FairOccupationDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+             java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.DeliveryStrategy.StrategyDeliveryPolicy">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></h3>
+<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#getNameOfStrategy--">getNameOfStrategy</a>, <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#setNameOfStrategy-java.lang.String-">setNameOfStrategy</a>, <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FairOccupationDelivery--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FairOccupationDelivery</h4>
+<pre>public&nbsp;FairOccupationDelivery()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseCourier</h4>
+<pre>public&nbsp;<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;chooseCourier(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+                             <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+                             java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></code>&nbsp;in class&nbsp;<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FairOccupationDelivery.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/FairOccupationDelivery.html" target="_top">Frames</a></li>
+<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/FastestDelivery.html b/doc/DeliveryStrategy/FastestDelivery.html
index c0acf50..1039f19 100644
--- a/doc/DeliveryStrategy/FastestDelivery.html
+++ b/doc/DeliveryStrategy/FastestDelivery.html
@@ -1,280 +1,296 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>FastestDelivery</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FastestDelivery";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FastestDelivery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/FastestDelivery.html" target="_top">Frames</a></li>
-<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">DeliveryStrategy</div>
-<h2 title="Class FastestDelivery" class="title">Class FastestDelivery</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>DeliveryStrategy.FastestDelivery</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FastestDelivery</span>
-extends java.lang.Object
-implements <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#FastestDelivery--">FastestDelivery</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FastestDelivery--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FastestDelivery</h4>
-<pre>public&nbsp;FastestDelivery()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseCourier-java.util.ArrayList-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseCourier</h4>
-<pre>public&nbsp;void&nbsp;chooseCourier(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></code>&nbsp;in interface&nbsp;<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FastestDelivery.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/FastestDelivery.html" target="_top">Frames</a></li>
-<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>FastestDelivery</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FastestDelivery";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FastestDelivery.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/FastestDelivery.html" target="_top">Frames</a></li>
+<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">DeliveryStrategy</div>
+<h2 title="Class FastestDelivery" class="title">Class FastestDelivery</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">DeliveryStrategy.StrategyDeliveryPolicy</a></li>
+<li>
+<ul class="inheritance">
+<li>DeliveryStrategy.FastestDelivery</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FastestDelivery</span>
+extends <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></pre>
+<div class="block">Will give the order to the nearest courier.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#FastestDelivery--">FastestDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.DeliveryStrategy.StrategyDeliveryPolicy">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></h3>
+<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#getNameOfStrategy--">getNameOfStrategy</a>, <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#setNameOfStrategy-java.lang.String-">setNameOfStrategy</a>, <a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FastestDelivery--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FastestDelivery</h4>
+<pre>public&nbsp;FastestDelivery()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseCourier</h4>
+<pre>public&nbsp;<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;chooseCourier(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+                             <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+                             java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></code>&nbsp;in class&nbsp;<code><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FastestDelivery.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/FastestDelivery.html" target="_top">Frames</a></li>
+<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/StrategyDeliveryPolicy.html b/doc/DeliveryStrategy/StrategyDeliveryPolicy.html
index e6fb725..eb87dbd 100644
--- a/doc/DeliveryStrategy/StrategyDeliveryPolicy.html
+++ b/doc/DeliveryStrategy/StrategyDeliveryPolicy.html
@@ -1,225 +1,327 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>StrategyDeliveryPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StrategyDeliveryPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/StrategyDeliveryPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">DeliveryStrategy</div>
-<h2 title="Interface StrategyDeliveryPolicy" class="title">Interface StrategyDeliveryPolicy</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a>, <a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">StrategyDeliveryPolicy</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseCourier-java.util.ArrayList-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseCourier</h4>
-<pre>void&nbsp;chooseCourier(java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/StrategyDeliveryPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>StrategyDeliveryPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="StrategyDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/StrategyDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">DeliveryStrategy</div>
+<h2 title="Class StrategyDeliveryPolicy" class="title">Class StrategyDeliveryPolicy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>DeliveryStrategy.StrategyDeliveryPolicy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a>, <a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">StrategyDeliveryPolicy</span>
+extends java.lang.Object</pre>
+<div class="block">Abstract Class of the strategy Delivery</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#StrategyDeliveryPolicy--">StrategyDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract <a href="../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#setNameOfStrategy-java.lang.String-">setNameOfStrategy</a></span>(java.lang.String&nbsp;nameOfStrategy)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="StrategyDeliveryPolicy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>StrategyDeliveryPolicy</h4>
+<pre>public&nbsp;StrategyDeliveryPolicy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getNameOfStrategy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNameOfStrategy</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getNameOfStrategy()</pre>
+</li>
+</ul>
+<a name="setNameOfStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNameOfStrategy</h4>
+<pre>public&nbsp;void&nbsp;setNameOfStrategy(java.lang.String&nbsp;nameOfStrategy)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseCourier</h4>
+<pre>public abstract&nbsp;<a href="../User/Courier.html" title="class in User">Courier</a>&nbsp;chooseCourier(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+                                      <a href="../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+                                      java.util.ArrayList&lt;<a href="../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/StrategyDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/class-use/ContextDeliveryStrategy.html b/doc/DeliveryStrategy/class-use/ContextDeliveryStrategy.html
index da148c9..b818e88 100644
--- a/doc/DeliveryStrategy/class-use/ContextDeliveryStrategy.html
+++ b/doc/DeliveryStrategy/class-use/ContextDeliveryStrategy.html
@@ -1,200 +1,200 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class DeliveryStrategy.ContextDeliveryStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class DeliveryStrategy.ContextDeliveryStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class DeliveryStrategy.ContextDeliveryStrategy" class="title">Uses of Class<br>DeliveryStrategy.ContextDeliveryStrategy</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy</a></span>(<a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                 <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class DeliveryStrategy.ContextDeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class DeliveryStrategy.ContextDeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class DeliveryStrategy.ContextDeliveryStrategy" class="title">Uses of Class<br>DeliveryStrategy.ContextDeliveryStrategy</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy</a></span>(<a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;contextDeliveryPolicy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                 <a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/ContextDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/class-use/FairOccupationDelivery.html b/doc/DeliveryStrategy/class-use/FairOccupationDelivery.html
index cbf4cc2..c0994b6 100644
--- a/doc/DeliveryStrategy/class-use/FairOccupationDelivery.html
+++ b/doc/DeliveryStrategy/class-use/FairOccupationDelivery.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class DeliveryStrategy.FairOccupationDelivery</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class DeliveryStrategy.FairOccupationDelivery";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/FairOccupationDelivery.html" target="_top">Frames</a></li>
-<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class DeliveryStrategy.FairOccupationDelivery" class="title">Uses of Class<br>DeliveryStrategy.FairOccupationDelivery</h2>
-</div>
-<div class="classUseContainer">No usage of DeliveryStrategy.FairOccupationDelivery</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/FairOccupationDelivery.html" target="_top">Frames</a></li>
-<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class DeliveryStrategy.FairOccupationDelivery</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class DeliveryStrategy.FairOccupationDelivery";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/FairOccupationDelivery.html" target="_top">Frames</a></li>
+<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class DeliveryStrategy.FairOccupationDelivery" class="title">Uses of Class<br>DeliveryStrategy.FairOccupationDelivery</h2>
+</div>
+<div class="classUseContainer">No usage of DeliveryStrategy.FairOccupationDelivery</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/FairOccupationDelivery.html" target="_top">Frames</a></li>
+<li><a href="FairOccupationDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/class-use/FastestDelivery.html b/doc/DeliveryStrategy/class-use/FastestDelivery.html
index 96b0936..d5cbe72 100644
--- a/doc/DeliveryStrategy/class-use/FastestDelivery.html
+++ b/doc/DeliveryStrategy/class-use/FastestDelivery.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class DeliveryStrategy.FastestDelivery</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class DeliveryStrategy.FastestDelivery";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/FastestDelivery.html" target="_top">Frames</a></li>
-<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class DeliveryStrategy.FastestDelivery" class="title">Uses of Class<br>DeliveryStrategy.FastestDelivery</h2>
-</div>
-<div class="classUseContainer">No usage of DeliveryStrategy.FastestDelivery</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/FastestDelivery.html" target="_top">Frames</a></li>
-<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class DeliveryStrategy.FastestDelivery</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class DeliveryStrategy.FastestDelivery";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/FastestDelivery.html" target="_top">Frames</a></li>
+<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class DeliveryStrategy.FastestDelivery" class="title">Uses of Class<br>DeliveryStrategy.FastestDelivery</h2>
+</div>
+<div class="classUseContainer">No usage of DeliveryStrategy.FastestDelivery</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/FastestDelivery.html" target="_top">Frames</a></li>
+<li><a href="FastestDelivery.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/class-use/StrategyDeliveryPolicy.html b/doc/DeliveryStrategy/class-use/StrategyDeliveryPolicy.html
index 7d87111..bbaf39f 100644
--- a/doc/DeliveryStrategy/class-use/StrategyDeliveryPolicy.html
+++ b/doc/DeliveryStrategy/class-use/StrategyDeliveryPolicy.html
@@ -1,168 +1,198 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface DeliveryStrategy.StrategyDeliveryPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface DeliveryStrategy.StrategyDeliveryPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface DeliveryStrategy.StrategyDeliveryPolicy" class="title">Uses of Interface<br>DeliveryStrategy.StrategyDeliveryPolicy</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that implement <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?DeliveryStrategy/class-use/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class DeliveryStrategy.StrategyDeliveryPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class DeliveryStrategy.StrategyDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class DeliveryStrategy.StrategyDeliveryPolicy" class="title">Uses of Class<br>DeliveryStrategy.StrategyDeliveryPolicy</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></span></code>
+<div class="block">Tend to give equally orders to all Couriers.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></span></code>
+<div class="block">Will give the order to the nearest courier.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that return <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ContextDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#getStrategy--">getStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with parameters of type <a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-DeliveryStrategy.StrategyDeliveryPolicy-">setStrategy</a></span>(<a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a>&nbsp;strategy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?DeliveryStrategy/class-use/StrategyDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/package-frame.html b/doc/DeliveryStrategy/package-frame.html
index eb2f576..91c2fd9 100644
--- a/doc/DeliveryStrategy/package-frame.html
+++ b/doc/DeliveryStrategy/package-frame.html
@@ -1,26 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>DeliveryStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../DeliveryStrategy/package-summary.html" target="classFrame">DeliveryStrategy</a></h1>
-<div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy" target="classFrame"><span class="interfaceName">StrategyDeliveryPolicy</span></a></li>
-</ul>
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="ContextDeliveryStrategy.html" title="class in DeliveryStrategy" target="classFrame">ContextDeliveryStrategy</a></li>
-<li><a href="FairOccupationDelivery.html" title="class in DeliveryStrategy" target="classFrame">FairOccupationDelivery</a></li>
-<li><a href="FastestDelivery.html" title="class in DeliveryStrategy" target="classFrame">FastestDelivery</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>DeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../DeliveryStrategy/package-summary.html" target="classFrame">DeliveryStrategy</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ContextDeliveryStrategy.html" title="class in DeliveryStrategy" target="classFrame">ContextDeliveryStrategy</a></li>
+<li><a href="FairOccupationDelivery.html" title="class in DeliveryStrategy" target="classFrame">FairOccupationDelivery</a></li>
+<li><a href="FastestDelivery.html" title="class in DeliveryStrategy" target="classFrame">FastestDelivery</a></li>
+<li><a href="StrategyDeliveryPolicy.html" title="class in DeliveryStrategy" target="classFrame">StrategyDeliveryPolicy</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/package-summary.html b/doc/DeliveryStrategy/package-summary.html
index f33589c..e1f087c 100644
--- a/doc/DeliveryStrategy/package-summary.html
+++ b/doc/DeliveryStrategy/package-summary.html
@@ -1,165 +1,162 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>DeliveryStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DeliveryStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Exception/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;DeliveryStrategy</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Exception/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>DeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Exception/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;DeliveryStrategy</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></td>
+<td class="colLast">
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></td>
+<td class="colLast">
+<div class="block">Tend to give equally orders to all Couriers.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></td>
+<td class="colLast">
+<div class="block">Will give the order to the nearest courier.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></td>
+<td class="colLast">
+<div class="block">Abstract Class of the strategy Delivery</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Exception/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/package-tree.html b/doc/DeliveryStrategy/package-tree.html
index 9050a9b..8ad80f1 100644
--- a/doc/DeliveryStrategy/package-tree.html
+++ b/doc/DeliveryStrategy/package-tree.html
@@ -1,143 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>DeliveryStrategy Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DeliveryStrategy Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/package-tree.html">Prev</a></li>
-<li><a href="../Exception/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package DeliveryStrategy</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> (implements Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
-<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a> (implements DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a>)</li>
-<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a> (implements DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a>)</li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Core/package-tree.html">Prev</a></li>
-<li><a href="../Exception/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>DeliveryStrategy Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DeliveryStrategy Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/package-tree.html">Prev</a></li>
+<li><a href="../Exception/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package DeliveryStrategy</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> (implements Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
+<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a>
+<ul>
+<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a></li>
+<li type="circle">DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Core/package-tree.html">Prev</a></li>
+<li><a href="../Exception/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/DeliveryStrategy/package-use.html b/doc/DeliveryStrategy/package-use.html
index 2187c80..9e1a9be 100644
--- a/doc/DeliveryStrategy/package-use.html
+++ b/doc/DeliveryStrategy/package-use.html
@@ -1,195 +1,201 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package DeliveryStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package DeliveryStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package DeliveryStrategy" class="title">Uses of Package<br>DeliveryStrategy</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../DeliveryStrategy/class-use/ContextDeliveryStrategy.html#Core">ContextDeliveryStrategy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../DeliveryStrategy/class-use/StrategyDeliveryPolicy.html#DeliveryStrategy">StrategyDeliveryPolicy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../DeliveryStrategy/class-use/ContextDeliveryStrategy.html#User">ContextDeliveryStrategy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?DeliveryStrategy/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package DeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package DeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package DeliveryStrategy" class="title">Uses of Package<br>DeliveryStrategy</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../DeliveryStrategy/class-use/ContextDeliveryStrategy.html#Core">ContextDeliveryStrategy</a>
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../DeliveryStrategy/class-use/StrategyDeliveryPolicy.html#DeliveryStrategy">StrategyDeliveryPolicy</a>
+<div class="block">Abstract Class of the strategy Delivery</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../DeliveryStrategy/class-use/ContextDeliveryStrategy.html#User">ContextDeliveryStrategy</a>
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?DeliveryStrategy/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/ExceptionUnknownDishType.html b/doc/Exception/ExceptionUnknownDishType.html
index 2f97eec..f317ca0 100644
--- a/doc/Exception/ExceptionUnknownDishType.html
+++ b/doc/Exception/ExceptionUnknownDishType.html
@@ -1,318 +1,318 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ExceptionUnknownDishType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ExceptionUnknownDishType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownDishType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Exception</div>
-<h2 title="Class ExceptionUnknownDishType" class="title">Class ExceptionUnknownDishType</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Throwable</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Exception</li>
-<li>
-<ul class="inheritance">
-<li>Exception.ExceptionUnknownDishType</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ExceptionUnknownDishType</span>
-extends java.lang.Exception</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#Exception.ExceptionUnknownDishType">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType--">ExceptionUnknownDishType</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message,
-                        java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message,
-                        java.lang.Throwable&nbsp;cause,
-                        boolean&nbsp;enableSuppression,
-                        boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.Throwable-">ExceptionUnknownDishType</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
-<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ExceptionUnknownDishType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownDishType</h4>
-<pre>public&nbsp;ExceptionUnknownDishType()</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownDishType-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownDishType</h4>
-<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownDishType-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownDishType</h4>
-<pre>public&nbsp;ExceptionUnknownDishType(java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownDishType</h4>
-<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message,
-                                java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ExceptionUnknownDishType</h4>
-<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message,
-                                java.lang.Throwable&nbsp;cause,
-                                boolean&nbsp;enableSuppression,
-                                boolean&nbsp;writableStackTrace)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownDishType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ExceptionUnknownDishType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ExceptionUnknownDishType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownDishType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Exception</div>
+<h2 title="Class ExceptionUnknownDishType" class="title">Class ExceptionUnknownDishType</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Exception.ExceptionUnknownDishType</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ExceptionUnknownDishType</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Exception.ExceptionUnknownDishType">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType--">ExceptionUnknownDishType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message,
+                        java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownDishType</a></span>(java.lang.String&nbsp;message,
+                        java.lang.Throwable&nbsp;cause,
+                        boolean&nbsp;enableSuppression,
+                        boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.Throwable-">ExceptionUnknownDishType</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ExceptionUnknownDishType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownDishType</h4>
+<pre>public&nbsp;ExceptionUnknownDishType()</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownDishType-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownDishType</h4>
+<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownDishType-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownDishType</h4>
+<pre>public&nbsp;ExceptionUnknownDishType(java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownDishType</h4>
+<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message,
+                                java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ExceptionUnknownDishType</h4>
+<pre>public&nbsp;ExceptionUnknownDishType(java.lang.String&nbsp;message,
+                                java.lang.Throwable&nbsp;cause,
+                                boolean&nbsp;enableSuppression,
+                                boolean&nbsp;writableStackTrace)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownDishType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/ExceptionUnknownMealType.html b/doc/Exception/ExceptionUnknownMealType.html
index 763cff5..6fefc9d 100644
--- a/doc/Exception/ExceptionUnknownMealType.html
+++ b/doc/Exception/ExceptionUnknownMealType.html
@@ -1,318 +1,318 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ExceptionUnknownMealType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ExceptionUnknownMealType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownMealType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Exception</div>
-<h2 title="Class ExceptionUnknownMealType" class="title">Class ExceptionUnknownMealType</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Throwable</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Exception</li>
-<li>
-<ul class="inheritance">
-<li>Exception.ExceptionUnknownMealType</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ExceptionUnknownMealType</span>
-extends java.lang.Exception</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#Exception.ExceptionUnknownMealType">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType--">ExceptionUnknownMealType</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0,
-                        java.lang.Throwable&nbsp;arg1)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0,
-                        java.lang.Throwable&nbsp;arg1,
-                        boolean&nbsp;arg2,
-                        boolean&nbsp;arg3)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.Throwable-">ExceptionUnknownMealType</a></span>(java.lang.Throwable&nbsp;arg0)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
-<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ExceptionUnknownMealType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownMealType</h4>
-<pre>public&nbsp;ExceptionUnknownMealType()</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownMealType-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownMealType</h4>
-<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownMealType-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownMealType</h4>
-<pre>public&nbsp;ExceptionUnknownMealType(java.lang.Throwable&nbsp;arg0)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownMealType</h4>
-<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0,
-                                java.lang.Throwable&nbsp;arg1)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ExceptionUnknownMealType</h4>
-<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0,
-                                java.lang.Throwable&nbsp;arg1,
-                                boolean&nbsp;arg2,
-                                boolean&nbsp;arg3)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownMealType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:31 CEST 2017 -->
+<title>ExceptionUnknownMealType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ExceptionUnknownMealType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownMealType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Exception</div>
+<h2 title="Class ExceptionUnknownMealType" class="title">Class ExceptionUnknownMealType</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Exception.ExceptionUnknownMealType</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ExceptionUnknownMealType</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Exception.ExceptionUnknownMealType">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType--">ExceptionUnknownMealType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0,
+                        java.lang.Throwable&nbsp;arg1)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownMealType</a></span>(java.lang.String&nbsp;arg0,
+                        java.lang.Throwable&nbsp;arg1,
+                        boolean&nbsp;arg2,
+                        boolean&nbsp;arg3)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.Throwable-">ExceptionUnknownMealType</a></span>(java.lang.Throwable&nbsp;arg0)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ExceptionUnknownMealType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownMealType</h4>
+<pre>public&nbsp;ExceptionUnknownMealType()</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownMealType-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownMealType</h4>
+<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownMealType-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownMealType</h4>
+<pre>public&nbsp;ExceptionUnknownMealType(java.lang.Throwable&nbsp;arg0)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownMealType</h4>
+<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0,
+                                java.lang.Throwable&nbsp;arg1)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ExceptionUnknownMealType</h4>
+<pre>public&nbsp;ExceptionUnknownMealType(java.lang.String&nbsp;arg0,
+                                java.lang.Throwable&nbsp;arg1,
+                                boolean&nbsp;arg2,
+                                boolean&nbsp;arg3)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownMealType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/ExceptionUnknownStartegyType.html b/doc/Exception/ExceptionUnknownStartegyType.html
index 5025424..bd6779c 100644
--- a/doc/Exception/ExceptionUnknownStartegyType.html
+++ b/doc/Exception/ExceptionUnknownStartegyType.html
@@ -1,318 +1,318 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ExceptionUnknownStartegyType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ExceptionUnknownStartegyType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownStartegyType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Exception</div>
-<h2 title="Class ExceptionUnknownStartegyType" class="title">Class ExceptionUnknownStartegyType</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Throwable</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Exception</li>
-<li>
-<ul class="inheritance">
-<li>Exception.ExceptionUnknownStartegyType</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ExceptionUnknownStartegyType</span>
-extends java.lang.Exception</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../serialized-form.html#Exception.ExceptionUnknownStartegyType">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType--">ExceptionUnknownStartegyType</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message,
-                            java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message,
-                            java.lang.Throwable&nbsp;cause,
-                            boolean&nbsp;enableSuppression,
-                            boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.Throwable-">ExceptionUnknownStartegyType</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
-<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ExceptionUnknownStartegyType--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownStartegyType</h4>
-<pre>public&nbsp;ExceptionUnknownStartegyType()</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownStartegyType-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownStartegyType</h4>
-<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownStartegyType-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownStartegyType</h4>
-<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ExceptionUnknownStartegyType</h4>
-<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message,
-                                    java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ExceptionUnknownStartegyType</h4>
-<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message,
-                                    java.lang.Throwable&nbsp;cause,
-                                    boolean&nbsp;enableSuppression,
-                                    boolean&nbsp;writableStackTrace)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ExceptionUnknownStartegyType.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>ExceptionUnknownStartegyType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ExceptionUnknownStartegyType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownStartegyType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Exception</div>
+<h2 title="Class ExceptionUnknownStartegyType" class="title">Class ExceptionUnknownStartegyType</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Exception.ExceptionUnknownStartegyType</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ExceptionUnknownStartegyType</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Exception.ExceptionUnknownStartegyType">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType--">ExceptionUnknownStartegyType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message,
+                            java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownStartegyType</a></span>(java.lang.String&nbsp;message,
+                            java.lang.Throwable&nbsp;cause,
+                            boolean&nbsp;enableSuppression,
+                            boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.Throwable-">ExceptionUnknownStartegyType</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ExceptionUnknownStartegyType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownStartegyType</h4>
+<pre>public&nbsp;ExceptionUnknownStartegyType()</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownStartegyType-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownStartegyType</h4>
+<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownStartegyType-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownStartegyType</h4>
+<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownStartegyType</h4>
+<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message,
+                                    java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ExceptionUnknownStartegyType</h4>
+<pre>public&nbsp;ExceptionUnknownStartegyType(java.lang.String&nbsp;message,
+                                    java.lang.Throwable&nbsp;cause,
+                                    boolean&nbsp;enableSuppression,
+                                    boolean&nbsp;writableStackTrace)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownStartegyType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/ExceptionUnknownTypeOfUser.html b/doc/Exception/ExceptionUnknownTypeOfUser.html
new file mode 100644
index 0000000..b3b67b6
--- /dev/null
+++ b/doc/Exception/ExceptionUnknownTypeOfUser.html
@@ -0,0 +1,318 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>ExceptionUnknownTypeOfUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ExceptionUnknownTypeOfUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownTypeOfUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Exception</div>
+<h2 title="Class ExceptionUnknownTypeOfUser" class="title">Class ExceptionUnknownTypeOfUser</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>Exception.ExceptionUnknownTypeOfUser</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ExceptionUnknownTypeOfUser</span>
+extends java.lang.Exception</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../serialized-form.html#Exception.ExceptionUnknownTypeOfUser">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser--">ExceptionUnknownTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-">ExceptionUnknownTypeOfUser</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-">ExceptionUnknownTypeOfUser</a></span>(java.lang.String&nbsp;message,
+                          java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownTypeOfUser</a></span>(java.lang.String&nbsp;message,
+                          java.lang.Throwable&nbsp;cause,
+                          boolean&nbsp;enableSuppression,
+                          boolean&nbsp;writableStackTrace)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.Throwable-">ExceptionUnknownTypeOfUser</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ExceptionUnknownTypeOfUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;ExceptionUnknownTypeOfUser()</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownTypeOfUser-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;ExceptionUnknownTypeOfUser(java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownTypeOfUser-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;ExceptionUnknownTypeOfUser(java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;ExceptionUnknownTypeOfUser(java.lang.String&nbsp;message,
+                                  java.lang.Throwable&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;ExceptionUnknownTypeOfUser(java.lang.String&nbsp;message,
+                                  java.lang.Throwable&nbsp;cause,
+                                  boolean&nbsp;enableSuppression,
+                                  boolean&nbsp;writableStackTrace)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ExceptionUnknownTypeOfUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/ExceptionUnknownTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/class-use/ExceptionUnknownDishType.html b/doc/Exception/class-use/ExceptionUnknownDishType.html
index f9f3039..37cef1a 100644
--- a/doc/Exception/class-use/ExceptionUnknownDishType.html
+++ b/doc/Exception/class-use/ExceptionUnknownDishType.html
@@ -1,191 +1,366 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Exception.ExceptionUnknownDishType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Exception.ExceptionUnknownDishType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Exception.ExceptionUnknownDishType" class="title">Uses of Class<br>Exception.ExceptionUnknownDishType</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Item/Dish.html" title="class in Item">Dish</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FactoryDish.</span><code><span class="memberNameLink"><a href="../../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
-          java.lang.String&nbsp;_name,
-          java.lang.String&nbsp;_typeOfFood,
-          double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Exception.ExceptionUnknownDishType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Exception.ExceptionUnknownDishType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Exception.ExceptionUnknownDishType" class="title">Uses of Class<br>Exception.ExceptionUnknownDishType</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#test">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AddDishRestaurantMenu.</span><code><span class="memberNameLink"><a href="../../Commands/AddDishRestaurantMenu.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Dish.html" title="class in Item">Dish</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryDish.</span><code><span class="memberNameLink"><a href="../../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
+          java.lang.String&nbsp;_name,
+          java.lang.String&nbsp;_typeOfFood,
+          double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="test">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../test/package-summary.html">test</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../test/package-summary.html">test</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testAcceptDelivery--">testAcceptDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testAddDish--">testAddDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testAddDish--">testAddDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testAddMeal--">testAddMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testCreateDish--">testCreateDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testCreateFullMeal--">testCreateFullMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testCreateHalfMeal--">testCreateHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetAverageIncomePerCustomer--">testGetAverageIncomePerCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastActiveCourier--">testGetLeastActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastSellingRestaurant--">testGetLeastSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostActiveCourier--">testGetMostActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostSellingRestaurant--">testGetMostSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testGetNbOfOrderOfTheDay--">testGetNbOfOrderOfTheDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testGetPointInTheCard--">testGetPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOrder.</span><code><span class="memberNameLink"><a href="../../test/TestOrder.html#testGetPrice--">testGetPrice</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testGetSortListOfDish--">testGetSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testGetSortListOfHalfMeal--">testGetSortListOfHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalIncome--">testGetTotalIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalProfit--">testGetTotalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testInFoodora--">testInFoodora</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testNotifyObservers--">testNotifyObservers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testPlaceOrder--">testPlaceOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCard.</span><code><span class="memberNameLink"><a href="../../test/TestCard.html#testPointInTheCard--">testPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testRemoveDish--">testRemoveDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testRemoveDish--">testRemoveDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testRemoveMeal--">testRemoveMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that throw <a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addDish-java.lang.String-java.lang.String-java.lang.String-double-">addDish</a></span>(java.lang.String&nbsp;typeInMeal,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;typeOfFood,
+       double&nbsp;price)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownDishType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownDishType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownDishType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/class-use/ExceptionUnknownMealType.html b/doc/Exception/class-use/ExceptionUnknownMealType.html
index 8cdca1c..2e0e482 100644
--- a/doc/Exception/class-use/ExceptionUnknownMealType.html
+++ b/doc/Exception/class-use/ExceptionUnknownMealType.html
@@ -1,188 +1,306 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Exception.ExceptionUnknownMealType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Exception.ExceptionUnknownMealType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Exception.ExceptionUnknownMealType" class="title">Uses of Class<br>Exception.ExceptionUnknownMealType</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FactoryMeal.</span><code><span class="memberNameLink"><a href="../../Item/FactoryMeal.html#createMeal-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Exception.ExceptionUnknownMealType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Exception.ExceptionUnknownMealType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Exception.ExceptionUnknownMealType" class="title">Uses of Class<br>Exception.ExceptionUnknownMealType</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#test">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CreateMeal.</span><code><span class="memberNameLink"><a href="../../Commands/CreateMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryMeal.</span><code><span class="memberNameLink"><a href="../../Item/FactoryMeal.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="test">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../test/package-summary.html">test</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../test/package-summary.html">test</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testAddDish--">testAddDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testAddMeal--">testAddMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testCreateFullMeal--">testCreateFullMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testCreateHalfMeal--">testCreateHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOrder.</span><code><span class="memberNameLink"><a href="../../test/TestOrder.html#testGetPrice--">testGetPrice</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testGetSortListOfHalfMeal--">testGetSortListOfHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testInFoodora--">testInFoodora</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testNotifyObservers--">testNotifyObservers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestItem.</span><code><span class="memberNameLink"><a href="../../test/TestItem.html#testRemoveDish--">testRemoveDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testRemoveMeal--">testRemoveMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that throw <a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addMeal-java.lang.String-java.lang.String-java.util.ArrayList-">addMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+       java.lang.String&nbsp;typeOfMeal,
+       java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listOfDish)</code>
+<div class="block">SETTERS</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownMealType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownMealType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownMealType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/class-use/ExceptionUnknownStartegyType.html b/doc/Exception/class-use/ExceptionUnknownStartegyType.html
index 71d8ec4..1246458 100644
--- a/doc/Exception/class-use/ExceptionUnknownStartegyType.html
+++ b/doc/Exception/class-use/ExceptionUnknownStartegyType.html
@@ -1,249 +1,460 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Exception.ExceptionUnknownStartegyType</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Exception.ExceptionUnknownStartegyType";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Exception.ExceptionUnknownStartegyType" class="title">Uses of Class<br>Exception.ExceptionUnknownStartegyType</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextStrategy.</span><code><span class="memberNameLink"><a href="../../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../Core/package-summary.html">Core</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#MyFoodora--">MyFoodora</a></span>()</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Exception/class-use/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
-<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Exception.ExceptionUnknownStartegyType</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Exception.ExceptionUnknownStartegyType";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Exception.ExceptionUnknownStartegyType" class="title">Uses of Class<br>Exception.ExceptionUnknownStartegyType</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#test">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetProfitPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetProfitPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">SetDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../Commands/SetDeliveryPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">AssociateCard.</span><code><span class="memberNameLink"><a href="../../Commands/AssociateCard.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextStrategy.</span><code><span class="memberNameLink"><a href="../../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="test">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a> in <a href="../../test/package-summary.html">test</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../test/package-summary.html">test</a> that throw <a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testAcceptDelivery--">testAcceptDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testActivateUser--">testActivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testAddUser--">testAddUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testChangeServiceFee--">testChangeServiceFee</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCli.</span><code><span class="memberNameLink"><a href="../../test/TestCli.html#testClui--">testClui</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestTargetProfitStrategy.html#testDeliveryCost--">testDeliveryCost</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testDesactivateUser--">testDesactivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestException.</span><code><span class="memberNameLink"><a href="../../test/TestException.html#testExceptionUnknownTypeOfUser--">testExceptionUnknownTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestDeliveryStrategy.html#testFairOccupation--">testFairOccupation</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestDeliveryStrategy.html#testFastestDelivery--">testFastestDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetAverageIncomePerCustomer--">testGetAverageIncomePerCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testGetCard--">testGetCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetLastMonthIncome--">testGetLastMonthIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetLastMonthNumberOfCommands--">testGetLastMonthNumberOfCommands</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastActiveCourier--">testGetLeastActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastSellingRestaurant--">testGetLeastSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostActiveCourier--">testGetMostActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostSellingRestaurant--">testGetMostSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testGetNbOfOrderOfTheDay--">testGetNbOfOrderOfTheDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testGetPointInTheCard--">testGetPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testGetSortListOfDish--">testGetSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalIncome--">testGetTotalIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalProfit--">testGetTotalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetUserByLogin--">testGetUserByLogin</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetUserByName--">testGetUserByName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testInFoodora--">testInFoodora</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestTargetProfitStrategy.html#testMarkupPercentage--">testMarkupPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCard.</span><code><span class="memberNameLink"><a href="../../test/TestCard.html#testPercentageInTheCard--">testPercentageInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testPlaceOrder--">testPlaceOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCard.</span><code><span class="memberNameLink"><a href="../../test/TestCard.html#testPointInTheCard--">testPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testRegister--">testRegister</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testRemoveUser--">testRemoveUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testRemoveWithID--">testRemoveWithID</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestTargetProfitStrategy.html#testServiceFee--">testServiceFee</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testSetDeliveryPolicy--">testSetDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testSetTargetProfitPolicy--">testSetTargetProfitPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testUnregister--">testUnregister</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownStartegyType.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownStartegyType.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/class-use/ExceptionUnknownTypeOfUser.html b/doc/Exception/class-use/ExceptionUnknownTypeOfUser.html
new file mode 100644
index 0000000..76160f9
--- /dev/null
+++ b/doc/Exception/class-use/ExceptionUnknownTypeOfUser.html
@@ -0,0 +1,441 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class Exception.ExceptionUnknownTypeOfUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Exception.ExceptionUnknownTypeOfUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Exception.ExceptionUnknownTypeOfUser" class="title">Uses of Class<br>Exception.ExceptionUnknownTypeOfUser</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#test">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a> in <a href="../../Cli/package-summary.html">Cli</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Cli/package-summary.html">Cli</a> that throw <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">Command.</span><code><span class="memberNameLink"><a href="../../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arguments,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a> in <a href="../../Commands/package-summary.html">Commands</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Commands/package-summary.html">Commands</a> that throw <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterRestaurant.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterRestaurant.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterManager.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterManager.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCustomer.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RegisterCourier.</span><code><span class="memberNameLink"><a href="../../Commands/RegisterCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute</a></span>(java.util.ArrayList&lt;java.lang.String&gt;&nbsp;arg,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       <a href="../../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a>&nbsp;activeUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="test">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a> in <a href="../../test/package-summary.html">test</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../test/package-summary.html">test</a> that throw <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testAcceptDelivery--">testAcceptDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testActivateUser--">testActivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testAddUser--">testAddUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestUserFactory.</span><code><span class="memberNameLink"><a href="../../test/TestUserFactory.html#testCreateHumanUser--">testCreateHumanUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestUserFactory.</span><code><span class="memberNameLink"><a href="../../test/TestUserFactory.html#testCreateMoralUser--">testCreateMoralUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testDesactivateUser--">testDesactivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestException.</span><code><span class="memberNameLink"><a href="../../test/TestException.html#testExceptionUnknownTypeOfUser--">testExceptionUnknownTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestDeliveryStrategy.html#testFairOccupation--">testFairOccupation</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestDeliveryStrategy.</span><code><span class="memberNameLink"><a href="../../test/TestDeliveryStrategy.html#testFastestDelivery--">testFastestDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetAverageIncomePerCustomer--">testGetAverageIncomePerCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastActiveCourier--">testGetLeastActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetLeastSellingRestaurant--">testGetLeastSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostActiveCourier--">testGetMostActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetMostSellingRestaurant--">testGetMostSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCourier.</span><code><span class="memberNameLink"><a href="../../test/TestCourier.html#testGetNbOfOrderOfTheDay--">testGetNbOfOrderOfTheDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testGetPointInTheCard--">testGetPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testGetSortListOfDish--">testGetSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalIncome--">testGetTotalIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testGetTotalProfit--">testGetTotalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetUserByLogin--">testGetUserByLogin</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testGetUserByName--">testGetUserByName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestOffers.</span><code><span class="memberNameLink"><a href="../../test/TestOffers.html#testInFoodora--">testInFoodora</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCard.</span><code><span class="memberNameLink"><a href="../../test/TestCard.html#testPercentageInTheCard--">testPercentageInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCustomer.</span><code><span class="memberNameLink"><a href="../../test/TestCustomer.html#testPlaceOrder--">testPlaceOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCard.</span><code><span class="memberNameLink"><a href="../../test/TestCard.html#testPointInTheCard--">testPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestManager.</span><code><span class="memberNameLink"><a href="../../test/TestManager.html#testRemoveUser--">testRemoveUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestCore.</span><code><span class="memberNameLink"><a href="../../test/TestCore.html#testRemoveWithID--">testRemoveWithID</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TestRestaurant.</span><code><span class="memberNameLink"><a href="../../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that throw <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       int&nbsp;typeOfUser,
+       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that throw <a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory</a></span>(java.lang.String&nbsp;typeOfUserFactory)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Exception/class-use/ExceptionUnknownTypeOfUser.html" target="_top">Frames</a></li>
+<li><a href="ExceptionUnknownTypeOfUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/package-frame.html b/doc/Exception/package-frame.html
index 536e598..d0091b8 100644
--- a/doc/Exception/package-frame.html
+++ b/doc/Exception/package-frame.html
@@ -1,22 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Exception</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Exception/package-summary.html" target="classFrame">Exception</a></h1>
-<div class="indexContainer">
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="ExceptionUnknownDishType.html" title="class in Exception" target="classFrame">ExceptionUnknownDishType</a></li>
-<li><a href="ExceptionUnknownMealType.html" title="class in Exception" target="classFrame">ExceptionUnknownMealType</a></li>
-<li><a href="ExceptionUnknownStartegyType.html" title="class in Exception" target="classFrame">ExceptionUnknownStartegyType</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Exception</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Exception/package-summary.html" target="classFrame">Exception</a></h1>
+<div class="indexContainer">
+<h2 title="Exceptions">Exceptions</h2>
+<ul title="Exceptions">
+<li><a href="ExceptionUnknownDishType.html" title="class in Exception" target="classFrame">ExceptionUnknownDishType</a></li>
+<li><a href="ExceptionUnknownMealType.html" title="class in Exception" target="classFrame">ExceptionUnknownMealType</a></li>
+<li><a href="ExceptionUnknownStartegyType.html" title="class in Exception" target="classFrame">ExceptionUnknownStartegyType</a></li>
+<li><a href="ExceptionUnknownTypeOfUser.html" title="class in Exception" target="classFrame">ExceptionUnknownTypeOfUser</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Exception/package-summary.html b/doc/Exception/package-summary.html
index 9e6107d..817f902 100644
--- a/doc/Exception/package-summary.html
+++ b/doc/Exception/package-summary.html
@@ -1,150 +1,154 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Exception</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Exception";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Item/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Exception</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Exception</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Item/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Exception</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Exception";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Item/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Exception</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
+<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Exception</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Item/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/package-tree.html b/doc/Exception/package-tree.html
index 08d94f5..8cb8bd6 100644
--- a/doc/Exception/package-tree.html
+++ b/doc/Exception/package-tree.html
@@ -1,147 +1,148 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Exception Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Exception Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/package-tree.html">Prev</a></li>
-<li><a href="../Item/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Exception</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">java.lang.Throwable (implements java.io.Serializable)
-<ul>
-<li type="circle">java.lang.Exception
-<ul>
-<li type="circle">Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a></li>
-<li type="circle">Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a></li>
-<li type="circle">Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../DeliveryStrategy/package-tree.html">Prev</a></li>
-<li><a href="../Item/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Exception Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Exception Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/package-tree.html">Prev</a></li>
+<li><a href="../Item/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Exception</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Throwable (implements java.io.Serializable)
+<ul>
+<li type="circle">java.lang.Exception
+<ul>
+<li type="circle">Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a></li>
+<li type="circle">Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a></li>
+<li type="circle">Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a></li>
+<li type="circle">Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownTypeOfUser</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../DeliveryStrategy/package-tree.html">Prev</a></li>
+<li><a href="../Item/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Exception/package-use.html b/doc/Exception/package-use.html
index 5af5181..709e3cf 100644
--- a/doc/Exception/package-use.html
+++ b/doc/Exception/package-use.html
@@ -1,223 +1,345 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Exception</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Exception";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Exception" class="title">Uses of Package<br>Exception</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Exception/package-summary.html">Exception</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#Core">ExceptionUnknownDishType</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#Core">ExceptionUnknownMealType</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#Core">ExceptionUnknownStartegyType</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#DeliveryStrategy">ExceptionUnknownStartegyType</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#Item">ExceptionUnknownDishType</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#Item">ExceptionUnknownMealType</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#StrategyProfit">ExceptionUnknownStartegyType</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Exception/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Exception</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Exception";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Exception" class="title">Uses of Package<br>Exception</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Exception/package-summary.html">Exception</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Cli">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Commands">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#test">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Cli">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Cli/package-summary.html">Cli</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#Cli">ExceptionUnknownDishType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#Cli">ExceptionUnknownMealType</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#Cli">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownTypeOfUser.html#Cli">ExceptionUnknownTypeOfUser</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Commands">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Commands/package-summary.html">Commands</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#Commands">ExceptionUnknownDishType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#Commands">ExceptionUnknownMealType</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#Commands">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownTypeOfUser.html#Commands">ExceptionUnknownTypeOfUser</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#Core">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#DeliveryStrategy">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#Item">ExceptionUnknownDishType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#Item">ExceptionUnknownMealType</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#StrategyProfit">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#User">ExceptionUnknownDishType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#User">ExceptionUnknownMealType</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownTypeOfUser.html#User">ExceptionUnknownTypeOfUser</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownTypeOfUser.html#UserFactoryPattern">ExceptionUnknownTypeOfUser</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="test">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Exception/package-summary.html">Exception</a> used by <a href="../test/package-summary.html">test</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownDishType.html#test">ExceptionUnknownDishType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownMealType.html#test">ExceptionUnknownMealType</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownStartegyType.html#test">ExceptionUnknownStartegyType</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Exception/class-use/ExceptionUnknownTypeOfUser.html#test">ExceptionUnknownTypeOfUser</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Exception/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/Dessert.html b/doc/Item/Dessert.html
index 52ca411..fa05abe 100644
--- a/doc/Item/Dessert.html
+++ b/doc/Item/Dessert.html
@@ -1,269 +1,265 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Dessert</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Dessert";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Dessert.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Dessert.html" target="_top">Frames</a></li>
-<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class Dessert" class="title">Class Dessert</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.Dessert</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Dessert</span>
-extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Dessert.html#Dessert-java.lang.String-java.lang.String-double-">Dessert</a></span>(java.lang.String&nbsp;name,
-       java.lang.String&nbsp;typeOfFood,
-       double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
-<code><a href="../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a>, <a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Dessert-java.lang.String-java.lang.String-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Dessert</h4>
-<pre>public&nbsp;Dessert(java.lang.String&nbsp;name,
-               java.lang.String&nbsp;typeOfFood,
-               double&nbsp;_price)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Dessert.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Dessert.html" target="_top">Frames</a></li>
-<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Dessert</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Dessert";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Dessert.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Dessert.html" target="_top">Frames</a></li>
+<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class Dessert" class="title">Class Dessert</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.Dessert</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Dessert</span>
+extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Dessert.html#Dessert-java.lang.String-java.lang.String-double-">Dessert</a></span>(java.lang.String&nbsp;name,
+       java.lang.String&nbsp;typeOfFood,
+       double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
+<code><a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getNbOfSell--">getNbOfSell</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setNbOfSell-long-">setNbOfSell</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Dessert-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Dessert</h4>
+<pre>public&nbsp;Dessert(java.lang.String&nbsp;name,
+               java.lang.String&nbsp;typeOfFood,
+               double&nbsp;_price)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Dessert.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Dessert.html" target="_top">Frames</a></li>
+<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/Dish.html b/doc/Item/Dish.html
index 0ca026f..1e78de1 100644
--- a/doc/Item/Dish.html
+++ b/doc/Item/Dish.html
@@ -1,385 +1,392 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Dish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Dish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Dish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Dish.html" target="_top">Frames</a></li>
-<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class Dish" class="title">Class Dish</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.Dish</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../Item/Dessert.html" title="class in Item">Dessert</a>, <a href="../Item/MainDish.html" title="class in Item">MainDish</a>, <a href="../Item/Starter.html" title="class in Item">Starter</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Dish</span>
-extends <a href="../Item/Item.html" title="class in Item">Item</a>
-implements <a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Dish.html#Dish-java.lang.String-java.lang.String-double-">Dish</a></span>(java.lang.String&nbsp;name,
-    java.lang.String&nbsp;typeOfFood,
-    double&nbsp;_price)</code>
-<div class="block">CONSTURCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>
-<div class="block">VISIT LOGIC</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;d)</code>
-<div class="block">OVERRIDE</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a></span>()</code>
-<div class="block">GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#setPrice-double-">setPrice</a></span>(double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Dish-java.lang.String-java.lang.String-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Dish</h4>
-<pre>public&nbsp;Dish(java.lang.String&nbsp;name,
-            java.lang.String&nbsp;typeOfFood,
-            double&nbsp;_price)</pre>
-<div class="block">CONSTURCTOR</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getTypeInMeal--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTypeInMeal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getTypeInMeal()</pre>
-<div class="block">GETTER AND SETTER</div>
-</li>
-</ul>
-<a name="getPrice--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPrice</h4>
-<pre>public&nbsp;double&nbsp;getPrice()</pre>
-</li>
-</ul>
-<a name="setPrice-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPrice</h4>
-<pre>public&nbsp;void&nbsp;setPrice(double&nbsp;_price)</pre>
-</li>
-</ul>
-<a name="acceptPrice-Item.VisitorPrice-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>acceptPrice</h4>
-<pre>public&nbsp;void&nbsp;acceptPrice(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</pre>
-<div class="block">VISIT LOGIC</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></code>&nbsp;in interface&nbsp;<code><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="equals-java.lang.Object-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;d)</pre>
-<div class="block">OVERRIDE</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Dish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Dish.html" target="_top">Frames</a></li>
-<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>Dish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Dish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Dish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Dish.html" target="_top">Frames</a></li>
+<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class Dish" class="title">Class Dish</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.Dish</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../Item/Dessert.html" title="class in Item">Dessert</a>, <a href="../Item/MainDish.html" title="class in Item">MainDish</a>, <a href="../Item/Starter.html" title="class in Item">Starter</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Dish</span>
+extends <a href="../Item/Item.html" title="class in Item">Item</a></pre>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Dish.html#Dish-java.lang.String-java.lang.String-double-">Dish</a></span>(java.lang.String&nbsp;name,
+    java.lang.String&nbsp;typeOfFood,
+    double&nbsp;_price)</code>
+<div class="block">CONSTURCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;d)</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#getNbOfSell--">getNbOfSell</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a></span>()</code>
+<div class="block">GETTER AND SETTER</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#setNbOfSell-long-">setNbOfSell</a></span>(long&nbsp;nbOfSell)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#setPrice-double-">setPrice</a></span>(double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Dish.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Dish-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Dish</h4>
+<pre>public&nbsp;Dish(java.lang.String&nbsp;name,
+            java.lang.String&nbsp;typeOfFood,
+            double&nbsp;_price)</pre>
+<div class="block">CONSTURCTOR</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getTypeInMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTypeInMeal</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getTypeInMeal()</pre>
+<div class="block">GETTER AND SETTER</div>
+</li>
+</ul>
+<a name="getNbOfSell--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNbOfSell</h4>
+<pre>public&nbsp;long&nbsp;getNbOfSell()</pre>
+</li>
+</ul>
+<a name="setNbOfSell-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNbOfSell</h4>
+<pre>public&nbsp;void&nbsp;setNbOfSell(long&nbsp;nbOfSell)</pre>
+</li>
+</ul>
+<a name="getPrice--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPrice</h4>
+<pre>public&nbsp;double&nbsp;getPrice()</pre>
+</li>
+</ul>
+<a name="setPrice-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPrice</h4>
+<pre>public&nbsp;void&nbsp;setPrice(double&nbsp;_price)</pre>
+</li>
+</ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;d)</pre>
+<div class="block">OVERRIDE</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Dish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Dish.html" target="_top">Frames</a></li>
+<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/FactoryDish.html b/doc/Item/FactoryDish.html
index f72b5cf..e1bd4fe 100644
--- a/doc/Item/FactoryDish.html
+++ b/doc/Item/FactoryDish.html
@@ -1,282 +1,288 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>FactoryDish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FactoryDish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryDish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FactoryDish.html" target="_top">Frames</a></li>
-<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class FactoryDish" class="title">Class FactoryDish</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Item.FactoryDish</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FactoryDish</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FactoryDish.html#FactoryDish--">FactoryDish</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../Item/Dish.html" title="class in Item">Dish</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
-          java.lang.String&nbsp;_name,
-          java.lang.String&nbsp;_typeOfFood,
-          double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FactoryDish--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FactoryDish</h4>
-<pre>public&nbsp;FactoryDish()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createDish-java.lang.String-java.lang.String-java.lang.String-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createDish</h4>
-<pre>public&nbsp;<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;createDish(java.lang.String&nbsp;typeInMeal,
-                       java.lang.String&nbsp;_name,
-                       java.lang.String&nbsp;_typeOfFood,
-                       double&nbsp;_price)
-                throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryDish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FactoryDish.html" target="_top">Frames</a></li>
-<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>FactoryDish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FactoryDish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryDish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FactoryDish.html" target="_top">Frames</a></li>
+<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class FactoryDish" class="title">Class FactoryDish</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Item.FactoryDish</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FactoryDish</span>
+extends java.lang.Object</pre>
+<div class="block">This factory allow us to create generic type of food as we want to,
+ it's then easy to add a Drink category if we want to.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FactoryDish.html#FactoryDish--">FactoryDish</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../Item/Dish.html" title="class in Item">Dish</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
+          java.lang.String&nbsp;_name,
+          java.lang.String&nbsp;_typeOfFood,
+          double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FactoryDish--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FactoryDish</h4>
+<pre>public&nbsp;FactoryDish()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createDish-java.lang.String-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createDish</h4>
+<pre>public&nbsp;<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;createDish(java.lang.String&nbsp;typeInMeal,
+                       java.lang.String&nbsp;_name,
+                       java.lang.String&nbsp;_typeOfFood,
+                       double&nbsp;_price)
+                throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryDish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FactoryDish.html" target="_top">Frames</a></li>
+<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/FactoryMeal.html b/doc/Item/FactoryMeal.html
index 7a1aae6..2978c82 100644
--- a/doc/Item/FactoryMeal.html
+++ b/doc/Item/FactoryMeal.html
@@ -1,276 +1,283 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>FactoryMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FactoryMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FactoryMeal.html" target="_top">Frames</a></li>
-<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class FactoryMeal" class="title">Class FactoryMeal</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Item.FactoryMeal</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FactoryMeal</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FactoryMeal.html#FactoryMeal--">FactoryMeal</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/FactoryMeal.html#createMeal-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FactoryMeal--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FactoryMeal</h4>
-<pre>public&nbsp;FactoryMeal()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createMeal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createMeal</h4>
-<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;createMeal(java.lang.String&nbsp;typeOfMeal)
-                throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FactoryMeal.html" target="_top">Frames</a></li>
-<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>FactoryMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FactoryMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FactoryMeal.html" target="_top">Frames</a></li>
+<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class FactoryMeal" class="title">Class FactoryMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Item.FactoryMeal</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FactoryMeal</span>
+extends java.lang.Object</pre>
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FactoryMeal.html#FactoryMeal--">FactoryMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/FactoryMeal.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FactoryMeal--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FactoryMeal</h4>
+<pre>public&nbsp;FactoryMeal()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createMeal-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createMeal</h4>
+<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;createMeal(java.lang.String&nbsp;nameOfMeal,
+                       java.lang.String&nbsp;typeOfMeal)
+                throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FactoryMeal.html" target="_top">Frames</a></li>
+<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/FullMeal.html b/doc/Item/FullMeal.html
index 039b790..b393018 100644
--- a/doc/Item/FullMeal.html
+++ b/doc/Item/FullMeal.html
@@ -1,267 +1,268 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>FullMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FullMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FullMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FullMeal.html" target="_top">Frames</a></li>
-<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class FullMeal" class="title">Class FullMeal</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Meal.html" title="class in Item">Item.Meal</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.FullMeal</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>, <a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FullMeal</span>
-extends <a href="../Item/Meal.html" title="class in Item">Meal</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FullMeal.html#FullMeal-java.lang.String-java.lang.String-">FullMeal</a></span>(java.lang.String&nbsp;name,
-        java.lang.String&nbsp;typeOfFood)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Meal">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></h3>
-<code><a href="../Item/Meal.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a>, <a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a>, <a href="../Item/Meal.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Meal.html#getListDish--">getListDish</a>, <a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a>, <a href="../Item/Meal.html#getPrice--">getPrice</a>, <a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a>, <a href="../Item/Meal.html#removeDish-int-">removeDish</a>, <a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a>, <a href="../Item/Meal.html#setPrice-double-">setPrice</a>, <a href="../Item/Meal.html#toString--">toString</a>, <a href="../Item/Meal.html#visitPrice-Item.VisitablePrice-">visitPrice</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FullMeal-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FullMeal</h4>
-<pre>public&nbsp;FullMeal(java.lang.String&nbsp;name,
-                java.lang.String&nbsp;typeOfFood)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FullMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/FullMeal.html" target="_top">Frames</a></li>
-<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>FullMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FullMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FullMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FullMeal.html" target="_top">Frames</a></li>
+<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class FullMeal" class="title">Class FullMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Meal.html" title="class in Item">Item.Meal</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.FullMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FullMeal</span>
+extends <a href="../Item/Meal.html" title="class in Item">Meal</a></pre>
+<div class="block">Type of full meal containing starter, mainDish and dessert.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/FullMeal.html#FullMeal-java.lang.String-java.lang.String-">FullMeal</a></span>(java.lang.String&nbsp;name,
+        java.lang.String&nbsp;typeOfFood)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Meal">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></h3>
+<code><a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a>, <a href="../Item/Meal.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Meal.html#getListDish--">getListDish</a>, <a href="../Item/Meal.html#getNbOfSell--">getNbOfSell</a>, <a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a>, <a href="../Item/Meal.html#getPrice--">getPrice</a>, <a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a>, <a href="../Item/Meal.html#removeDish-int-">removeDish</a>, <a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a>, <a href="../Item/Meal.html#setNbOfSell-long-">setNbOfSell</a>, <a href="../Item/Meal.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FullMeal-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FullMeal</h4>
+<pre>public&nbsp;FullMeal(java.lang.String&nbsp;name,
+                java.lang.String&nbsp;typeOfFood)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FullMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/FullMeal.html" target="_top">Frames</a></li>
+<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/HalfMeal.html b/doc/Item/HalfMeal.html
index 027f367..fad8763 100644
--- a/doc/Item/HalfMeal.html
+++ b/doc/Item/HalfMeal.html
@@ -1,267 +1,268 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>HalfMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HalfMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HalfMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/HalfMeal.html" target="_top">Frames</a></li>
-<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class HalfMeal" class="title">Class HalfMeal</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Meal.html" title="class in Item">Item.Meal</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.HalfMeal</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>, <a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">HalfMeal</span>
-extends <a href="../Item/Meal.html" title="class in Item">Meal</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/HalfMeal.html#HalfMeal-java.lang.String-java.lang.String-">HalfMeal</a></span>(java.lang.String&nbsp;name,
-        java.lang.String&nbsp;typeOfFood)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Meal">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></h3>
-<code><a href="../Item/Meal.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a>, <a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a>, <a href="../Item/Meal.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Meal.html#getListDish--">getListDish</a>, <a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a>, <a href="../Item/Meal.html#getPrice--">getPrice</a>, <a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a>, <a href="../Item/Meal.html#removeDish-int-">removeDish</a>, <a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a>, <a href="../Item/Meal.html#setPrice-double-">setPrice</a>, <a href="../Item/Meal.html#toString--">toString</a>, <a href="../Item/Meal.html#visitPrice-Item.VisitablePrice-">visitPrice</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="HalfMeal-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>HalfMeal</h4>
-<pre>public&nbsp;HalfMeal(java.lang.String&nbsp;name,
-                java.lang.String&nbsp;typeOfFood)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HalfMeal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/HalfMeal.html" target="_top">Frames</a></li>
-<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>HalfMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="HalfMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HalfMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/HalfMeal.html" target="_top">Frames</a></li>
+<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class HalfMeal" class="title">Class HalfMeal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Meal.html" title="class in Item">Item.Meal</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.HalfMeal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">HalfMeal</span>
+extends <a href="../Item/Meal.html" title="class in Item">Meal</a></pre>
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/HalfMeal.html#HalfMeal-java.lang.String-java.lang.String-">HalfMeal</a></span>(java.lang.String&nbsp;name,
+        java.lang.String&nbsp;typeOfFood)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Meal">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></h3>
+<code><a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a>, <a href="../Item/Meal.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Meal.html#getListDish--">getListDish</a>, <a href="../Item/Meal.html#getNbOfSell--">getNbOfSell</a>, <a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a>, <a href="../Item/Meal.html#getPrice--">getPrice</a>, <a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a>, <a href="../Item/Meal.html#removeDish-int-">removeDish</a>, <a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a>, <a href="../Item/Meal.html#setNbOfSell-long-">setNbOfSell</a>, <a href="../Item/Meal.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="HalfMeal-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HalfMeal</h4>
+<pre>public&nbsp;HalfMeal(java.lang.String&nbsp;name,
+                java.lang.String&nbsp;typeOfFood)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HalfMeal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/HalfMeal.html" target="_top">Frames</a></li>
+<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Meal">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/Item.html b/doc/Item/Item.html
index 8e5ab54..301056b 100644
--- a/doc/Item/Item.html
+++ b/doc/Item/Item.html
@@ -1,334 +1,327 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Item</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Item";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Item.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Item.html" target="_top">Frames</a></li>
-<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class Item" class="title">Class Item</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Item.Item</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../Item/Dish.html" title="class in Item">Dish</a>, <a href="../Item/Meal.html" title="class in Item">Meal</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">Item</span>
-extends java.lang.Object
-implements <a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Item.html#Item-java.lang.String-java.lang.String-">Item</a></span>(java.lang.String&nbsp;_name,
-    java.lang.String&nbsp;_typeOfFood)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#getName--">getName</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a></span>()</code>
-<div class="block">GETTER & SETTER</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;_name)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></span>(java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.VisitablePrice">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;Item.<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></h3>
-<code><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Item-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Item</h4>
-<pre>public&nbsp;Item(java.lang.String&nbsp;_name,
-            java.lang.String&nbsp;_typeOfFood)</pre>
-<div class="block">CONSTRUCTOR</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getTypeOfFood--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTypeOfFood</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getTypeOfFood()</pre>
-<div class="block">GETTER & SETTER</div>
-</li>
-</ul>
-<a name="setTypeOfFood-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTypeOfFood</h4>
-<pre>public&nbsp;void&nbsp;setTypeOfFood(java.lang.String&nbsp;_typeOfFood)</pre>
-</li>
-</ul>
-<a name="getName--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getName</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
-</li>
-</ul>
-<a name="setName-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setName</h4>
-<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;_name)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Item.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Item.html" target="_top">Frames</a></li>
-<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Item</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Item";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Item.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Item.html" target="_top">Frames</a></li>
+<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class Item" class="title">Class Item</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Item.Item</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../Item/Dish.html" title="class in Item">Dish</a>, <a href="../Item/Meal.html" title="class in Item">Meal</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">Item</span>
+extends java.lang.Object</pre>
+<div class="block">An item is an abstraction of a meal or a dish.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Item.html#Item-java.lang.String-java.lang.String-">Item</a></span>(java.lang.String&nbsp;_name,
+    java.lang.String&nbsp;_typeOfFood)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#getName--">getName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a></span>()</code>
+<div class="block">GETTER & SETTER</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;_name)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></span>(java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Item-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Item</h4>
+<pre>public&nbsp;Item(java.lang.String&nbsp;_name,
+            java.lang.String&nbsp;_typeOfFood)</pre>
+<div class="block">CONSTRUCTOR</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getTypeOfFood--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTypeOfFood</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getTypeOfFood()</pre>
+<div class="block">GETTER & SETTER</div>
+</li>
+</ul>
+<a name="setTypeOfFood-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTypeOfFood</h4>
+<pre>public&nbsp;void&nbsp;setTypeOfFood(java.lang.String&nbsp;_typeOfFood)</pre>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+</li>
+</ul>
+<a name="setName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setName</h4>
+<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;_name)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Item.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Item.html" target="_top">Frames</a></li>
+<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/MainDish.html b/doc/Item/MainDish.html
index 60d1aef..dcfe5f2 100644
--- a/doc/Item/MainDish.html
+++ b/doc/Item/MainDish.html
@@ -1,269 +1,265 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>MainDish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MainDish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MainDish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/MainDish.html" target="_top">Frames</a></li>
-<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class MainDish" class="title">Class MainDish</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.MainDish</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MainDish</span>
-extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/MainDish.html#MainDish-java.lang.String-java.lang.String-double-">MainDish</a></span>(java.lang.String&nbsp;name,
-        java.lang.String&nbsp;typeOfFood,
-        double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
-<code><a href="../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a>, <a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MainDish-java.lang.String-java.lang.String-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MainDish</h4>
-<pre>public&nbsp;MainDish(java.lang.String&nbsp;name,
-                java.lang.String&nbsp;typeOfFood,
-                double&nbsp;_price)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MainDish.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/MainDish.html" target="_top">Frames</a></li>
-<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>MainDish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MainDish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MainDish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/MainDish.html" target="_top">Frames</a></li>
+<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class MainDish" class="title">Class MainDish</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.MainDish</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MainDish</span>
+extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/MainDish.html#MainDish-java.lang.String-java.lang.String-double-">MainDish</a></span>(java.lang.String&nbsp;name,
+        java.lang.String&nbsp;typeOfFood,
+        double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
+<code><a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getNbOfSell--">getNbOfSell</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setNbOfSell-long-">setNbOfSell</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MainDish-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MainDish</h4>
+<pre>public&nbsp;MainDish(java.lang.String&nbsp;name,
+                java.lang.String&nbsp;typeOfFood,
+                double&nbsp;_price)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MainDish.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/MainDish.html" target="_top">Frames</a></li>
+<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/Meal.html b/doc/Item/Meal.html
index 021f8dd..2e25d3a 100644
--- a/doc/Item/Meal.html
+++ b/doc/Item/Meal.html
@@ -1,478 +1,453 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Meal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Meal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Meal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Meal.html" target="_top">Frames</a></li>
-<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class Meal" class="title">Class Meal</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.Meal</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>, <a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../Item/FullMeal.html" title="class in Item">FullMeal</a>, <a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">Meal</span>
-extends <a href="../Item/Item.html" title="class in Item">Item</a>
-implements <a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></pre>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.
- For exemple, the patterns below show how a full meal may be created and then a half meal :
- fullMealPattern={{"Starter"},{"MainDish"},{"Dessert"}}
- halfMealPattern={{"Starter","Dessert"},{"MainDish"}}
- 
- We may create a children meal very easily :
- chlidrenMealPattern={{"MainDish"},{"Dessert"},{"Drink"}}</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Meal.html#Meal-java.lang.String-java.lang.String-">Meal</a></span>(java.lang.String&nbsp;name,
-    java.lang.String&nbsp;typeOfFood)</code>
-<div class="block">CONSTRUCTORS</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>
-<div class="block">VISIT LOGIC</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</code>
-<div class="block">add and remove dishes</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;m)</code>
-<div class="block">OVERRIDE</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>java.lang.String[][]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a></span>()</code>
-<div class="block">GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-int-">removeDish</a></span>(int&nbsp;num)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#setPrice-double-">setPrice</a></span>(double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Meal-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Meal</h4>
-<pre>public&nbsp;Meal(java.lang.String&nbsp;name,
-            java.lang.String&nbsp;typeOfFood)</pre>
-<div class="block">CONSTRUCTORS</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addDish-Item.Dish-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addDish</h4>
-<pre>public&nbsp;void&nbsp;addDish(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</pre>
-<div class="block">add and remove dishes</div>
-</li>
-</ul>
-<a name="removeDish-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeDish</h4>
-<pre>public&nbsp;void&nbsp;removeDish(java.lang.String&nbsp;name)</pre>
-</li>
-</ul>
-<a name="removeDish-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeDish</h4>
-<pre>public&nbsp;void&nbsp;removeDish(int&nbsp;num)</pre>
-</li>
-</ul>
-<a name="getTypeOfMeal--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTypeOfMeal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getTypeOfMeal()</pre>
-<div class="block">GETTER AND SETTER</div>
-</li>
-</ul>
-<a name="getPrice--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPrice</h4>
-<pre>public&nbsp;double&nbsp;getPrice()</pre>
-</li>
-</ul>
-<a name="setPrice-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPrice</h4>
-<pre>public&nbsp;void&nbsp;setPrice(double&nbsp;_price)</pre>
-</li>
-</ul>
-<a name="getListDish--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListDish</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getListDish()</pre>
-</li>
-</ul>
-<a name="getPatternTypeInMeal--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPatternTypeInMeal</h4>
-<pre>public&nbsp;java.lang.String[][]&nbsp;getPatternTypeInMeal()</pre>
-</li>
-</ul>
-<a name="acceptPrice-Item.VisitorPrice-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>acceptPrice</h4>
-<pre>public&nbsp;void&nbsp;acceptPrice(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</pre>
-<div class="block">VISIT LOGIC</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></code>&nbsp;in interface&nbsp;<code><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="visitPrice-Item.VisitablePrice-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>visitPrice</h4>
-<pre>public&nbsp;void&nbsp;visitPrice(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></code>&nbsp;in interface&nbsp;<code><a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="equals-java.lang.Object-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;m)</pre>
-<div class="block">OVERRIDE</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Meal.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Meal.html" target="_top">Frames</a></li>
-<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Meal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Meal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Meal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Meal.html" target="_top">Frames</a></li>
+<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class Meal" class="title">Class Meal</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.Meal</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../Item/FullMeal.html" title="class in Item">FullMeal</a>, <a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">Meal</span>
+extends <a href="../Item/Item.html" title="class in Item">Item</a></pre>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.
+ For exemple, the patterns below show how a full meal may be created and then a half meal :
+ fullMealPattern={{"Starter"},{"MainDish"},{"Dessert"}}
+ halfMealPattern={{"Starter","Dessert"},{"MainDish"}}
+ 
+ We may create a children meal very easily :
+ chlidrenMealPattern={{"MainDish"},{"Dessert"},{"Drink"}}</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Meal.html#Meal-java.lang.String-java.lang.String-">Meal</a></span>(java.lang.String&nbsp;name,
+    java.lang.String&nbsp;typeOfFood)</code>
+<div class="block">CONSTRUCTORS</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#addDish-Item.Dish-">addDish</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</code>
+<div class="block">add and remove dishes</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;m)</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getNbOfSell--">getNbOfSell</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String[][]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal</a></span>()</code>
+<div class="block">GETTER AND SETTER</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-int-">removeDish</a></span>(int&nbsp;num)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#setNbOfSell-long-">setNbOfSell</a></span>(long&nbsp;nbOfSell)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/Meal.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Meal-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Meal</h4>
+<pre>public&nbsp;Meal(java.lang.String&nbsp;name,
+            java.lang.String&nbsp;typeOfFood)</pre>
+<div class="block">CONSTRUCTORS</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addDish-Item.Dish-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addDish</h4>
+<pre>public&nbsp;void&nbsp;addDish(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</pre>
+<div class="block">add and remove dishes</div>
+</li>
+</ul>
+<a name="removeDish-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeDish</h4>
+<pre>public&nbsp;void&nbsp;removeDish(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="removeDish-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeDish</h4>
+<pre>public&nbsp;void&nbsp;removeDish(int&nbsp;num)</pre>
+</li>
+</ul>
+<a name="getTypeOfMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTypeOfMeal</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getTypeOfMeal()</pre>
+<div class="block">GETTER AND SETTER</div>
+</li>
+</ul>
+<a name="getNbOfSell--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNbOfSell</h4>
+<pre>public&nbsp;long&nbsp;getNbOfSell()</pre>
+</li>
+</ul>
+<a name="setNbOfSell-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNbOfSell</h4>
+<pre>public&nbsp;void&nbsp;setNbOfSell(long&nbsp;nbOfSell)</pre>
+</li>
+</ul>
+<a name="getPrice--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPrice</h4>
+<pre>public&nbsp;double&nbsp;getPrice()</pre>
+</li>
+</ul>
+<a name="getListDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListDish</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getListDish()</pre>
+</li>
+</ul>
+<a name="getPatternTypeInMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPatternTypeInMeal</h4>
+<pre>public&nbsp;java.lang.String[][]&nbsp;getPatternTypeInMeal()</pre>
+</li>
+</ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;m)</pre>
+<div class="block">OVERRIDE</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Meal.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Meal.html" target="_top">Frames</a></li>
+<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/MealFactory.html b/doc/Item/MealFactory.html
index 99af29b..6e8926b 100644
--- a/doc/Item/MealFactory.html
+++ b/doc/Item/MealFactory.html
@@ -1,275 +1,280 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>MealFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MealFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MealFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/MealFactory.html" target="_top">Frames</a></li>
-<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class MealFactory" class="title">Class MealFactory</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Item.MealFactory</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MealFactory</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/MealFactory.html#MealFactory--">MealFactory</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal,
-          java.lang.String&nbsp;_name,
-          java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MealFactory--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MealFactory</h4>
-<pre>public&nbsp;MealFactory()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createMeal-java.lang.String-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createMeal</h4>
-<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;createMeal(java.lang.String&nbsp;typeOfMeal,
-                       java.lang.String&nbsp;_name,
-                       java.lang.String&nbsp;_typeOfFood)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MealFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/MealFactory.html" target="_top">Frames</a></li>
-<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>MealFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MealFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MealFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/MealFactory.html" target="_top">Frames</a></li>
+<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class MealFactory" class="title">Class MealFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Item.MealFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MealFactory</span>
+extends java.lang.Object</pre>
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/MealFactory.html#MealFactory--">MealFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal,
+          java.lang.String&nbsp;_name,
+          java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MealFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MealFactory</h4>
+<pre>public&nbsp;MealFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createMeal-java.lang.String-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createMeal</h4>
+<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;createMeal(java.lang.String&nbsp;typeOfMeal,
+                       java.lang.String&nbsp;_name,
+                       java.lang.String&nbsp;_typeOfFood)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MealFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/MealFactory.html" target="_top">Frames</a></li>
+<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/Starter.html b/doc/Item/Starter.html
index 81d2f38..6166396 100644
--- a/doc/Item/Starter.html
+++ b/doc/Item/Starter.html
@@ -1,269 +1,265 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Starter</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Starter";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Starter.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Starter.html" target="_top">Frames</a></li>
-<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Class Starter" class="title">Class Starter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
-<li>
-<ul class="inheritance">
-<li>Item.Starter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Starter</span>
-extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Starter.html#Starter-java.lang.String-java.lang.String-double-">Starter</a></span>(java.lang.String&nbsp;name,
-       java.lang.String&nbsp;typeOfFood,
-       double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
-<code><a href="../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a>, <a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
-<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Starter-java.lang.String-java.lang.String-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Starter</h4>
-<pre>public&nbsp;Starter(java.lang.String&nbsp;name,
-               java.lang.String&nbsp;typeOfFood,
-               double&nbsp;_price)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Starter.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/Starter.html" target="_top">Frames</a></li>
-<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Starter</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Starter";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Starter.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Starter.html" target="_top">Frames</a></li>
+<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Class Starter" class="title">Class Starter</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Item.html" title="class in Item">Item.Item</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../Item/Dish.html" title="class in Item">Item.Dish</a></li>
+<li>
+<ul class="inheritance">
+<li>Item.Starter</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Starter</span>
+extends <a href="../Item/Dish.html" title="class in Item">Dish</a></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Item/Starter.html#Starter-java.lang.String-java.lang.String-double-">Starter</a></span>(java.lang.String&nbsp;name,
+       java.lang.String&nbsp;typeOfFood,
+       double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Dish">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></h3>
+<code><a href="../Item/Dish.html#equals-java.lang.Object-">equals</a>, <a href="../Item/Dish.html#getNbOfSell--">getNbOfSell</a>, <a href="../Item/Dish.html#getPrice--">getPrice</a>, <a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal</a>, <a href="../Item/Dish.html#setNbOfSell-long-">setNbOfSell</a>, <a href="../Item/Dish.html#setPrice-double-">setPrice</a>, <a href="../Item/Dish.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Item.Item">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Item.<a href="../Item/Item.html" title="class in Item">Item</a></h3>
+<code><a href="../Item/Item.html#getName--">getName</a>, <a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood</a>, <a href="../Item/Item.html#setName-java.lang.String-">setName</a>, <a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Starter-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Starter</h4>
+<pre>public&nbsp;Starter(java.lang.String&nbsp;name,
+               java.lang.String&nbsp;typeOfFood,
+               double&nbsp;_price)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Starter.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/Starter.html" target="_top">Frames</a></li>
+<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.Item.Dish">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/VisitablePrice.html b/doc/Item/VisitablePrice.html
index 18cf413..c7d91d9 100644
--- a/doc/Item/VisitablePrice.html
+++ b/doc/Item/VisitablePrice.html
@@ -1,225 +1,221 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>VisitablePrice</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VisitablePrice";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitablePrice.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/VisitablePrice.html" target="_top">Frames</a></li>
-<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Interface VisitablePrice" class="title">Interface VisitablePrice</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../Item/Dessert.html" title="class in Item">Dessert</a>, <a href="../Item/Dish.html" title="class in Item">Dish</a>, <a href="../Item/FullMeal.html" title="class in Item">FullMeal</a>, <a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>, <a href="../Item/Item.html" title="class in Item">Item</a>, <a href="../Item/MainDish.html" title="class in Item">MainDish</a>, <a href="../Item/Meal.html" title="class in Item">Meal</a>, <a href="../Item/Starter.html" title="class in Item">Starter</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">VisitablePrice</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="acceptPrice-Item.VisitorPrice-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>acceptPrice</h4>
-<pre>void&nbsp;acceptPrice(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitablePrice.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/VisitablePrice.html" target="_top">Frames</a></li>
-<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>VisitablePrice</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="VisitablePrice";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitablePrice.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/VisitablePrice.html" target="_top">Frames</a></li>
+<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Interface VisitablePrice" class="title">Interface VisitablePrice</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">VisitablePrice</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="acceptPrice-Item.VisitorPrice-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>acceptPrice</h4>
+<pre>void&nbsp;acceptPrice(<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitablePrice.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/VisitablePrice.html" target="_top">Frames</a></li>
+<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/VisitorPrice.html b/doc/Item/VisitorPrice.html
index 5011676..04c0121 100644
--- a/doc/Item/VisitorPrice.html
+++ b/doc/Item/VisitorPrice.html
@@ -1,225 +1,221 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>VisitorPrice</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="VisitorPrice";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitorPrice.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/VisitorPrice.html" target="_top">Frames</a></li>
-<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Item</div>
-<h2 title="Interface VisitorPrice" class="title">Interface VisitorPrice</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../Item/FullMeal.html" title="class in Item">FullMeal</a>, <a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>, <a href="../Item/Meal.html" title="class in Item">Meal</a>, <a href="../Order/Order.html" title="class in Order">Order</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">VisitorPrice</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="visitPrice-Item.VisitablePrice-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>visitPrice</h4>
-<pre>void&nbsp;visitPrice(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/VisitorPrice.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/VisitorPrice.html" target="_top">Frames</a></li>
-<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>VisitorPrice</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="VisitorPrice";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitorPrice.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/VisitorPrice.html" target="_top">Frames</a></li>
+<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Item</div>
+<h2 title="Interface VisitorPrice" class="title">Interface VisitorPrice</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">VisitorPrice</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="visitPrice-Item.VisitablePrice-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>visitPrice</h4>
+<pre>void&nbsp;visitPrice(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/VisitorPrice.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/VisitorPrice.html" target="_top">Frames</a></li>
+<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/Dessert.html b/doc/Item/class-use/Dessert.html
index 58b0aa9..99c8a21 100644
--- a/doc/Item/class-use/Dessert.html
+++ b/doc/Item/class-use/Dessert.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.Dessert</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.Dessert";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Dessert.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Dessert.html" target="_top">Frames</a></li>
-<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.Dessert" class="title">Uses of Class<br>Item.Dessert</h2>
-</div>
-<div class="classUseContainer">No usage of Item.Dessert</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Dessert.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Dessert.html" target="_top">Frames</a></li>
-<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.Dessert</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.Dessert";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Dessert.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Dessert.html" target="_top">Frames</a></li>
+<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.Dessert" class="title">Uses of Class<br>Item.Dessert</h2>
+</div>
+<div class="classUseContainer">No usage of Item.Dessert</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Dessert.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Dessert.html" target="_top">Frames</a></li>
+<li><a href="Dessert.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/Dish.html b/doc/Item/class-use/Dish.html
index 32dffcb..94afc52 100644
--- a/doc/Item/class-use/Dish.html
+++ b/doc/Item/class-use/Dish.html
@@ -1,283 +1,346 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.Dish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.Dish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Dish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Dish.html" target="_top">Frames</a></li>
-<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.Dish" class="title">Uses of Class<br>Item.Dish</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dessert.html" title="class in Item">Dessert</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/MainDish.html" title="class in Item">MainDish</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Starter.html" title="class in Item">Starter</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Item/Dish.html" title="class in Item">Dish</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FactoryDish.</span><code><span class="memberNameLink"><a href="../../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
-          java.lang.String&nbsp;_name,
-          java.lang.String&nbsp;_typeOfFood,
-          double&nbsp;_price)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return types with arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#addDish-Item.Dish-">addDish</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</code>
-<div class="block">add and remove dishes</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#add-Item.Dish-">add</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>
-<div class="block">AND & REMOVE</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#remove-Item.Dish-">remove</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getListOfDish--">getListOfDish</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addDish-Item.Dish-">addDish</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#removeDish-Item.Dish-">removeDish</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Dish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Dish.html" target="_top">Frames</a></li>
-<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.Dish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.Dish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Dish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Dish.html" target="_top">Frames</a></li>
+<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.Dish" class="title">Uses of Class<br>Item.Dish</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dessert.html" title="class in Item">Dessert</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/MainDish.html" title="class in Item">MainDish</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Starter.html" title="class in Item">Starter</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Dish.html" title="class in Item">Dish</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryDish.</span><code><span class="memberNameLink"><a href="../../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish</a></span>(java.lang.String&nbsp;typeInMeal,
+          java.lang.String&nbsp;_name,
+          java.lang.String&nbsp;_typeOfFood,
+          double&nbsp;_price)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return types with arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#addDish-Item.Dish-">addDish</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;dish)</code>
+<div class="block">add and remove dishes</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return types with arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#add-Item.Dish-">add</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#remove-Item.Dish-">remove</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Order/package-summary.html">Order</a> with type arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#setListDish-java.util.ArrayList-">setListDish</a></span>(java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listDish)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Dish.html" title="class in Item">Dish</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Dish.html" title="class in Item">Dish</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getDishByName-java.lang.String-">getDishByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getListOfDish--">getListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getSortedListOfDish-User.Restaurant-">getSortedListOfDish</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getSortListOfDish--">getSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addDishToMeal-Item.Dish-Item.Meal-">addDishToMeal</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d,
+             <a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#removeDish-Item.Dish-">removeDish</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../User/package-summary.html">User</a> with type arguments of type <a href="../../Item/Dish.html" title="class in Item">Dish</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addMeal-java.lang.String-java.lang.String-java.util.ArrayList-">addMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+       java.lang.String&nbsp;typeOfMeal,
+       java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listOfDish)</code>
+<div class="block">SETTERS</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Dish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Dish.html" target="_top">Frames</a></li>
+<li><a href="Dish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/FactoryDish.html b/doc/Item/class-use/FactoryDish.html
index 8099dc8..925ff3a 100644
--- a/doc/Item/class-use/FactoryDish.html
+++ b/doc/Item/class-use/FactoryDish.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.FactoryDish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.FactoryDish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FactoryDish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FactoryDish.html" target="_top">Frames</a></li>
-<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.FactoryDish" class="title">Uses of Class<br>Item.FactoryDish</h2>
-</div>
-<div class="classUseContainer">No usage of Item.FactoryDish</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FactoryDish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FactoryDish.html" target="_top">Frames</a></li>
-<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.FactoryDish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.FactoryDish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FactoryDish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FactoryDish.html" target="_top">Frames</a></li>
+<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.FactoryDish" class="title">Uses of Class<br>Item.FactoryDish</h2>
+</div>
+<div class="classUseContainer">No usage of Item.FactoryDish</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FactoryDish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FactoryDish.html" target="_top">Frames</a></li>
+<li><a href="FactoryDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/FactoryMeal.html b/doc/Item/class-use/FactoryMeal.html
index b2a139b..8410df0 100644
--- a/doc/Item/class-use/FactoryMeal.html
+++ b/doc/Item/class-use/FactoryMeal.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.FactoryMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.FactoryMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FactoryMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FactoryMeal.html" target="_top">Frames</a></li>
-<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.FactoryMeal" class="title">Uses of Class<br>Item.FactoryMeal</h2>
-</div>
-<div class="classUseContainer">No usage of Item.FactoryMeal</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FactoryMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FactoryMeal.html" target="_top">Frames</a></li>
-<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.FactoryMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.FactoryMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FactoryMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FactoryMeal.html" target="_top">Frames</a></li>
+<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.FactoryMeal" class="title">Uses of Class<br>Item.FactoryMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Item.FactoryMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FactoryMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FactoryMeal.html" target="_top">Frames</a></li>
+<li><a href="FactoryMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/FullMeal.html b/doc/Item/class-use/FullMeal.html
index 04b77f9..18105c5 100644
--- a/doc/Item/class-use/FullMeal.html
+++ b/doc/Item/class-use/FullMeal.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.FullMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.FullMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FullMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FullMeal.html" target="_top">Frames</a></li>
-<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.FullMeal" class="title">Uses of Class<br>Item.FullMeal</h2>
-</div>
-<div class="classUseContainer">No usage of Item.FullMeal</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/FullMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/FullMeal.html" target="_top">Frames</a></li>
-<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.FullMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.FullMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FullMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FullMeal.html" target="_top">Frames</a></li>
+<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.FullMeal" class="title">Uses of Class<br>Item.FullMeal</h2>
+</div>
+<div class="classUseContainer">No usage of Item.FullMeal</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/FullMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/FullMeal.html" target="_top">Frames</a></li>
+<li><a href="FullMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/HalfMeal.html b/doc/Item/class-use/HalfMeal.html
index f71a2c9..dbdf393 100644
--- a/doc/Item/class-use/HalfMeal.html
+++ b/doc/Item/class-use/HalfMeal.html
@@ -1,124 +1,168 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.HalfMeal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.HalfMeal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/HalfMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/HalfMeal.html" target="_top">Frames</a></li>
-<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.HalfMeal" class="title">Uses of Class<br>Item.HalfMeal</h2>
-</div>
-<div class="classUseContainer">No usage of Item.HalfMeal</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/HalfMeal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/HalfMeal.html" target="_top">Frames</a></li>
-<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.HalfMeal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.HalfMeal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/HalfMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/HalfMeal.html" target="_top">Frames</a></li>
+<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.HalfMeal" class="title">Uses of Class<br>Item.HalfMeal</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getSortedListOfHalfMeal-User.Restaurant-">getSortedListOfHalfMeal</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getSortListOfHalfMeal--">getSortListOfHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/HalfMeal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/HalfMeal.html" target="_top">Frames</a></li>
+<li><a href="HalfMeal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/Item.html b/doc/Item/class-use/Item.html
index 8242415..ce6e74b 100644
--- a/doc/Item/class-use/Item.html
+++ b/doc/Item/class-use/Item.html
@@ -1,193 +1,222 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.Item</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.Item";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Item.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Item.html" target="_top">Frames</a></li>
-<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.Item" class="title">Uses of Class<br>Item.Item</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Item/Item.html" title="class in Item">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Item.html" title="class in Item">Item</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../Item/Item.html" title="class in Item">Item</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dessert.html" title="class in Item">Dessert</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dish.html" title="class in Item">Dish</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/MainDish.html" title="class in Item">MainDish</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Meal.html" title="class in Item">Meal</a></span></code>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Starter.html" title="class in Item">Starter</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Item.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Item.html" target="_top">Frames</a></li>
-<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.Item</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.Item";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Item.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Item.html" target="_top">Frames</a></li>
+<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.Item" class="title">Uses of Class<br>Item.Item</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/Item.html" title="class in Item">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Item.html" title="class in Item">Item</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../Item/Item.html" title="class in Item">Item</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dessert.html" title="class in Item">Dessert</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dish.html" title="class in Item">Dish</a></span></code>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>
+<div class="block">Type of full meal containing starter, mainDish and dessert.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/MainDish.html" title="class in Item">MainDish</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Meal.html" title="class in Item">Meal</a></span></code>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Starter.html" title="class in Item">Starter</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Item.html" title="class in Item">Item</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Item/Item.html" title="class in Item">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Item.html" title="class in Item">Item</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getItemByName-java.lang.String-">getItemByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Item.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Item.html" target="_top">Frames</a></li>
+<li><a href="Item.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/MainDish.html b/doc/Item/class-use/MainDish.html
index e8c3d1c..e6f4337 100644
--- a/doc/Item/class-use/MainDish.html
+++ b/doc/Item/class-use/MainDish.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.MainDish</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.MainDish";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/MainDish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/MainDish.html" target="_top">Frames</a></li>
-<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.MainDish" class="title">Uses of Class<br>Item.MainDish</h2>
-</div>
-<div class="classUseContainer">No usage of Item.MainDish</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/MainDish.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/MainDish.html" target="_top">Frames</a></li>
-<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Class Item.MainDish</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.MainDish";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/MainDish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/MainDish.html" target="_top">Frames</a></li>
+<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.MainDish" class="title">Uses of Class<br>Item.MainDish</h2>
+</div>
+<div class="classUseContainer">No usage of Item.MainDish</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/MainDish.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/MainDish.html" target="_top">Frames</a></li>
+<li><a href="MainDish.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/Meal.html b/doc/Item/class-use/Meal.html
index 0afe718..0936d3a 100644
--- a/doc/Item/class-use/Meal.html
+++ b/doc/Item/class-use/Meal.html
@@ -1,302 +1,348 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.Meal</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.Meal";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Meal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Meal.html" target="_top">Frames</a></li>
-<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.Meal" class="title">Uses of Class<br>Item.Meal</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Offers">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FactoryMeal.</span><code><span class="memberNameLink"><a href="../../Item/FactoryMeal.html#createMeal-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MealFactory.</span><code><span class="memberNameLink"><a href="../../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal,
-          java.lang.String&nbsp;_name,
-          java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Offers">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> that return <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#getMeal--">getMeal</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#MealOfTheWeek-boolean-Item.Meal-java.util.ArrayList-">MealOfTheWeek</a></span>(boolean&nbsp;state,
-             <a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal,
-             java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#add-Item.Meal-">add</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#remove-Item.Meal-">remove</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getListOfMeal--">getListOfMeal</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addMeal-Item.Meal-">addMeal</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>
-<div class="block">SETTERS</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Meal.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Meal.html" target="_top">Frames</a></li>
-<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Item.Meal</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.Meal";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Meal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Meal.html" target="_top">Frames</a></li>
+<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.Meal" class="title">Uses of Class<br>Item.Meal</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>
+<div class="block">Type of full meal containing starter, mainDish and dessert.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> that return <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryMeal.</span><code><span class="memberNameLink"><a href="../../Item/FactoryMeal.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MealFactory.</span><code><span class="memberNameLink"><a href="../../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;typeOfMeal,
+          java.lang.String&nbsp;_name,
+          java.lang.String&nbsp;_typeOfFood)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> that return <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#getMeal--">getMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#MealOfTheWeek-Item.Meal-">MealOfTheWeek</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return types with arguments of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListMeal--">getListMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#add-Item.Meal-">add</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#remove-Item.Meal-">remove</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Order/package-summary.html">Order</a> with type arguments of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#setListMeal-java.util.ArrayList-">setListMeal</a></span>(java.util.ArrayList&lt;<a href="../../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;listMeal)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/Meal.html" title="class in Item">Meal</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getMealByName-java.lang.String-">getMealByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getListOfMeal--">getListOfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Item/Meal.html" title="class in Item">Meal</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#addDishToMeal-Item.Dish-Item.Meal-">addDishToMeal</a></span>(<a href="../../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d,
+             <a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal</a></span>(<a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Meal.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Meal.html" target="_top">Frames</a></li>
+<li><a href="Meal.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/MealFactory.html b/doc/Item/class-use/MealFactory.html
index 9259d38..99e181f 100644
--- a/doc/Item/class-use/MealFactory.html
+++ b/doc/Item/class-use/MealFactory.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.MealFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.MealFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/MealFactory.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/MealFactory.html" target="_top">Frames</a></li>
-<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.MealFactory" class="title">Uses of Class<br>Item.MealFactory</h2>
-</div>
-<div class="classUseContainer">No usage of Item.MealFactory</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/MealFactory.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/MealFactory.html" target="_top">Frames</a></li>
-<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Item.MealFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.MealFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/MealFactory.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/MealFactory.html" target="_top">Frames</a></li>
+<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.MealFactory" class="title">Uses of Class<br>Item.MealFactory</h2>
+</div>
+<div class="classUseContainer">No usage of Item.MealFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/MealFactory.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/MealFactory.html" target="_top">Frames</a></li>
+<li><a href="MealFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/Starter.html b/doc/Item/class-use/Starter.html
index 0372031..0089f46 100644
--- a/doc/Item/class-use/Starter.html
+++ b/doc/Item/class-use/Starter.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Item.Starter</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Item.Starter";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Starter.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Starter.html" target="_top">Frames</a></li>
-<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Item.Starter" class="title">Uses of Class<br>Item.Starter</h2>
-</div>
-<div class="classUseContainer">No usage of Item.Starter</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/Starter.html" title="class in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/Starter.html" target="_top">Frames</a></li>
-<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class Item.Starter</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Item.Starter";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Starter.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Starter.html" target="_top">Frames</a></li>
+<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Item.Starter" class="title">Uses of Class<br>Item.Starter</h2>
+</div>
+<div class="classUseContainer">No usage of Item.Starter</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/Starter.html" title="class in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/Starter.html" target="_top">Frames</a></li>
+<li><a href="Starter.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/VisitablePrice.html b/doc/Item/class-use/VisitablePrice.html
index 5717ed6..f48ae27 100644
--- a/doc/Item/class-use/VisitablePrice.html
+++ b/doc/Item/class-use/VisitablePrice.html
@@ -1,236 +1,164 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Item.VisitablePrice</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Item.VisitablePrice";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/VisitablePrice.html" title="interface in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/VisitablePrice.html" target="_top">Frames</a></li>
-<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Item.VisitablePrice" class="title">Uses of Interface<br>Item.VisitablePrice</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../Item/package-summary.html">Item</a> that implement <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dessert.html" title="class in Item">Dessert</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Dish.html" title="class in Item">Dish</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Item.html" title="class in Item">Item</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/MainDish.html" title="class in Item">MainDish</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Meal.html" title="class in Item">Meal</a></span></code>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Starter.html" title="class in Item">Starter</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">VisitorPrice.</span><code><span class="memberNameLink"><a href="../../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/VisitablePrice.html" title="interface in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/VisitablePrice.html" target="_top">Frames</a></li>
-<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Interface Item.VisitablePrice</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Item.VisitablePrice";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/VisitablePrice.html" title="interface in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/VisitablePrice.html" target="_top">Frames</a></li>
+<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Item.VisitablePrice" class="title">Uses of Interface<br>Item.VisitablePrice</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">VisitorPrice.</span><code><span class="memberNameLink"><a href="../../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/VisitablePrice.html" title="interface in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/VisitablePrice.html" target="_top">Frames</a></li>
+<li><a href="VisitablePrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/class-use/VisitorPrice.html b/doc/Item/class-use/VisitorPrice.html
index 581074c..2a4da61 100644
--- a/doc/Item/class-use/VisitorPrice.html
+++ b/doc/Item/class-use/VisitorPrice.html
@@ -1,224 +1,164 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Item.VisitorPrice</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Item.VisitorPrice";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/VisitorPrice.html" title="interface in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/VisitorPrice.html" target="_top">Frames</a></li>
-<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Item.VisitorPrice" class="title">Uses of Interface<br>Item.VisitorPrice</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a> in <a href="../../Item/package-summary.html">Item</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../Item/package-summary.html">Item</a> that implement <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/FullMeal.html" title="class in Item">FullMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Item/Meal.html" title="class in Item">Meal</a></span></code>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">VisitablePrice.</span><code><span class="memberNameLink"><a href="../../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Meal.</span><code><span class="memberNameLink"><a href="../../Item/Meal.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>
-<div class="block">VISIT LOGIC</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Dish.</span><code><span class="memberNameLink"><a href="../../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>
-<div class="block">VISIT LOGIC</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../Order/package-summary.html">Order</a> that implement <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Order/Order.html" title="class in Order">Order</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Item/VisitorPrice.html" title="interface in Item">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Item/class-use/VisitorPrice.html" target="_top">Frames</a></li>
-<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Interface Item.VisitorPrice</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Item.VisitorPrice";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/VisitorPrice.html" title="interface in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/VisitorPrice.html" target="_top">Frames</a></li>
+<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Item.VisitorPrice" class="title">Uses of Interface<br>Item.VisitorPrice</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a> in <a href="../../Item/package-summary.html">Item</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Item/package-summary.html">Item</a> with parameters of type <a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">VisitablePrice.</span><code><span class="memberNameLink"><a href="../../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice</a></span>(<a href="../../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>&nbsp;v)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Item/VisitorPrice.html" title="interface in Item">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Item/class-use/VisitorPrice.html" target="_top">Frames</a></li>
+<li><a href="VisitorPrice.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/package-frame.html b/doc/Item/package-frame.html
index 253a7dc..0347cef 100644
--- a/doc/Item/package-frame.html
+++ b/doc/Item/package-frame.html
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Item</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Item/package-summary.html" target="classFrame">Item</a></h1>
-<div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="VisitablePrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitablePrice</span></a></li>
-<li><a href="VisitorPrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitorPrice</span></a></li>
-</ul>
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="Dessert.html" title="class in Item" target="classFrame">Dessert</a></li>
-<li><a href="Dish.html" title="class in Item" target="classFrame">Dish</a></li>
-<li><a href="FactoryDish.html" title="class in Item" target="classFrame">FactoryDish</a></li>
-<li><a href="FactoryMeal.html" title="class in Item" target="classFrame">FactoryMeal</a></li>
-<li><a href="FullMeal.html" title="class in Item" target="classFrame">FullMeal</a></li>
-<li><a href="HalfMeal.html" title="class in Item" target="classFrame">HalfMeal</a></li>
-<li><a href="Item.html" title="class in Item" target="classFrame">Item</a></li>
-<li><a href="MainDish.html" title="class in Item" target="classFrame">MainDish</a></li>
-<li><a href="Meal.html" title="class in Item" target="classFrame">Meal</a></li>
-<li><a href="MealFactory.html" title="class in Item" target="classFrame">MealFactory</a></li>
-<li><a href="Starter.html" title="class in Item" target="classFrame">Starter</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Item</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Item/package-summary.html" target="classFrame">Item</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="VisitablePrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitablePrice</span></a></li>
+<li><a href="VisitorPrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitorPrice</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Dessert.html" title="class in Item" target="classFrame">Dessert</a></li>
+<li><a href="Dish.html" title="class in Item" target="classFrame">Dish</a></li>
+<li><a href="FactoryDish.html" title="class in Item" target="classFrame">FactoryDish</a></li>
+<li><a href="FactoryMeal.html" title="class in Item" target="classFrame">FactoryMeal</a></li>
+<li><a href="FullMeal.html" title="class in Item" target="classFrame">FullMeal</a></li>
+<li><a href="HalfMeal.html" title="class in Item" target="classFrame">HalfMeal</a></li>
+<li><a href="Item.html" title="class in Item" target="classFrame">Item</a></li>
+<li><a href="MainDish.html" title="class in Item" target="classFrame">MainDish</a></li>
+<li><a href="Meal.html" title="class in Item" target="classFrame">Meal</a></li>
+<li><a href="MealFactory.html" title="class in Item" target="classFrame">MealFactory</a></li>
+<li><a href="Starter.html" title="class in Item" target="classFrame">Starter</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Item/package-summary.html b/doc/Item/package-summary.html
index c8f2764..4d98c1a 100644
--- a/doc/Item/package-summary.html
+++ b/doc/Item/package-summary.html
@@ -1,206 +1,222 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Item</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Item";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Offers/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Item</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/Dessert.html" title="class in Item">Dessert</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/Dish.html" title="class in Item">Dish</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/FullMeal.html" title="class in Item">FullMeal</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/Item.html" title="class in Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/MainDish.html" title="class in Item">MainDish</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/Meal.html" title="class in Item">Meal</a></td>
-<td class="colLast">
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Item/Starter.html" title="class in Item">Starter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Offers/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Item</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Item";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Offers/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Item</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/Dessert.html" title="class in Item">Dessert</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/Dish.html" title="class in Item">Dish</a></td>
+<td class="colLast">
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></td>
+<td class="colLast">
+<div class="block">This factory allow us to create generic type of food as we want to,
+ it's then easy to add a Drink category if we want to.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></td>
+<td class="colLast">
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/FullMeal.html" title="class in Item">FullMeal</a></td>
+<td class="colLast">
+<div class="block">Type of full meal containing starter, mainDish and dessert.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></td>
+<td class="colLast">
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/Item.html" title="class in Item">Item</a></td>
+<td class="colLast">
+<div class="block">An item is an abstraction of a meal or a dish.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/MainDish.html" title="class in Item">MainDish</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/Meal.html" title="class in Item">Meal</a></td>
+<td class="colLast">
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></td>
+<td class="colLast">
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Item/Starter.html" title="class in Item">Starter</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Offers/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/package-tree.html b/doc/Item/package-tree.html
index 20dc99a..7e31126 100644
--- a/doc/Item/package-tree.html
+++ b/doc/Item/package-tree.html
@@ -1,161 +1,161 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Item Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Item Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/package-tree.html">Prev</a></li>
-<li><a href="../Offers/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Item</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Item.<a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a></li>
-<li type="circle">Item.<a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a></li>
-<li type="circle">Item.<a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a> (implements Item.<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>)
-<ul>
-<li type="circle">Item.<a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a> (implements Item.<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>)
-<ul>
-<li type="circle">Item.<a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a></li>
-<li type="circle">Item.<a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a></li>
-<li type="circle">Item.<a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a></li>
-</ul>
-</li>
-<li type="circle">Item.<a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a> (implements Item.<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>)
-<ul>
-<li type="circle">Item.<a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a></li>
-<li type="circle">Item.<a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">Item.<a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a></li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">Item.<a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a></li>
-<li type="circle">Item.<a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Exception/package-tree.html">Prev</a></li>
-<li><a href="../Offers/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Item Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Item Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/package-tree.html">Prev</a></li>
+<li><a href="../Offers/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Item</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Item.<a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a></li>
+<li type="circle">Item.<a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a></li>
+<li type="circle">Item.<a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a>
+<ul>
+<li type="circle">Item.<a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a>
+<ul>
+<li type="circle">Item.<a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a></li>
+<li type="circle">Item.<a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a></li>
+<li type="circle">Item.<a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a></li>
+</ul>
+</li>
+<li type="circle">Item.<a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a>
+<ul>
+<li type="circle">Item.<a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a></li>
+<li type="circle">Item.<a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">Item.<a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">Item.<a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a></li>
+<li type="circle">Item.<a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Exception/package-tree.html">Prev</a></li>
+<li><a href="../Offers/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Item/package-use.html b/doc/Item/package-use.html
index 85f2058..c4b625d 100644
--- a/doc/Item/package-use.html
+++ b/doc/Item/package-use.html
@@ -1,258 +1,273 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Item</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Item";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Item" class="title">Uses of Package<br>Item</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Item">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Offers">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Item">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/Dish.html#Item">Dish</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Item/class-use/Item.html#Item">Item</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/Meal.html#Item">Meal</a>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Item/class-use/VisitablePrice.html#Item">VisitablePrice</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/VisitorPrice.html#Item">VisitorPrice</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Offers">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/Meal.html#Offers">Meal</a>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/Dish.html#Order">Dish</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Item/class-use/Meal.html#Order">Meal</a>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/VisitablePrice.html#Order">VisitablePrice</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Item/class-use/VisitorPrice.html#Order">VisitorPrice</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Item/class-use/Dish.html#User">Dish</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Item/class-use/Meal.html#User">Meal</a>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Item/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Item</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Item";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Item" class="title">Uses of Package<br>Item</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Item">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Item">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Item/package-summary.html">Item</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Dish.html#Item">Dish</a>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Item/class-use/Item.html#Item">Item</a>
+<div class="block">An item is an abstraction of a meal or a dish.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Meal.html#Item">Meal</a>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Item/class-use/VisitablePrice.html#Item">VisitablePrice</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/VisitorPrice.html#Item">VisitorPrice</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Meal.html#Offers">Meal</a>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Dish.html#Order">Dish</a>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Item/class-use/Meal.html#Order">Meal</a>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Item/package-summary.html">Item</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Dish.html#User">Dish</a>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Item/class-use/HalfMeal.html#User">HalfMeal</a>
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Item/class-use/Item.html#User">Item</a>
+<div class="block">An item is an abstraction of a meal or a dish.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Item/class-use/Meal.html#User">Meal</a>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Item/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/BirthdayOffer.html b/doc/Offers/BirthdayOffer.html
new file mode 100644
index 0000000..57b5bcb
--- /dev/null
+++ b/doc/Offers/BirthdayOffer.html
@@ -0,0 +1,373 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>BirthdayOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="BirthdayOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BirthdayOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/BirthdayOffer.html" target="_top">Frames</a></li>
+<li><a href="BirthdayOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Offers</div>
+<h2 title="Class BirthdayOffer" class="title">Class BirthdayOffer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Offers.BirthdayOffer</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">BirthdayOffer</span>
+extends java.lang.Object
+implements <a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></pre>
+<div class="block">Gives a promotion when it's the customer's birthday</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#BirthdayOffer-boolean-java.util.ArrayList-">BirthdayOffer</a></span>(boolean&nbsp;state,
+             java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#getObservers--">getObservers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#isState--">isState</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#setObservers-java.util.ArrayList-">setObservers</a></span>(java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#setState-boolean-">setState</a></span>(boolean&nbsp;state)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="BirthdayOffer-boolean-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>BirthdayOffer</h4>
+<pre>public&nbsp;BirthdayOffer(boolean&nbsp;state,
+                     java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="attachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>attachObserver</h4>
+<pre>public&nbsp;void&nbsp;attachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="detachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>detachObserver</h4>
+<pre>public&nbsp;void&nbsp;detachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isState--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isState</h4>
+<pre>public&nbsp;boolean&nbsp;isState()</pre>
+</li>
+</ul>
+<a name="setState-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setState</h4>
+<pre>public&nbsp;void&nbsp;setState(boolean&nbsp;state)</pre>
+</li>
+</ul>
+<a name="getObservers--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getObservers</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;getObservers()</pre>
+</li>
+</ul>
+<a name="setObservers-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setObservers</h4>
+<pre>public&nbsp;void&nbsp;setObservers(java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</pre>
+</li>
+</ul>
+<a name="notifyObservers-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>notifyObservers</h4>
+<pre>public&nbsp;void&nbsp;notifyObservers(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BirthdayOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/BirthdayOffer.html" target="_top">Frames</a></li>
+<li><a href="BirthdayOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/MealOfTheWeek.html b/doc/Offers/MealOfTheWeek.html
index f9e58b8..5245516 100644
--- a/doc/Offers/MealOfTheWeek.html
+++ b/doc/Offers/MealOfTheWeek.html
@@ -1,370 +1,412 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>MealOfTheWeek</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MealOfTheWeek";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MealOfTheWeek.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/MealOfTheWeek.html" target="_top">Frames</a></li>
-<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Offers</div>
-<h2 title="Class MealOfTheWeek" class="title">Class MealOfTheWeek</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Offers.MealOfTheWeek</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MealOfTheWeek</span>
-extends java.lang.Object
-implements <a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#MealOfTheWeek-boolean-Item.Meal-java.util.ArrayList-">MealOfTheWeek</a></span>(boolean&nbsp;state,
-             <a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal,
-             java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getMeal--">getMeal</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#isState--">isState</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#notifyall--">notifyall</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setState-boolean-">setState</a></span>(boolean&nbsp;state)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MealOfTheWeek-boolean-Item.Meal-java.util.ArrayList-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MealOfTheWeek</h4>
-<pre>public&nbsp;MealOfTheWeek(boolean&nbsp;state,
-                     <a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal,
-                     java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="isState--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isState</h4>
-<pre>public&nbsp;boolean&nbsp;isState()</pre>
-</li>
-</ul>
-<a name="setState-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setState</h4>
-<pre>public&nbsp;void&nbsp;setState(boolean&nbsp;state)</pre>
-</li>
-</ul>
-<a name="getMeal--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMeal</h4>
-<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;getMeal()</pre>
-</li>
-</ul>
-<a name="setMeal-Item.Meal-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setMeal</h4>
-<pre>public&nbsp;void&nbsp;setMeal(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</pre>
-</li>
-</ul>
-<a name="attachObserver-Offers.Observer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>attachObserver</h4>
-<pre>public&nbsp;void&nbsp;attachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="detachObserver-Offers.Observer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>detachObserver</h4>
-<pre>public&nbsp;void&nbsp;detachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="notifyall--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>notifyall</h4>
-<pre>public&nbsp;void&nbsp;notifyall()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Offers/ObservableOffer.html#notifyall--">notifyall</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MealOfTheWeek.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/MealOfTheWeek.html" target="_top">Frames</a></li>
-<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>MealOfTheWeek</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MealOfTheWeek";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MealOfTheWeek.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/BirthdayOffer.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/MealOfTheWeek.html" target="_top">Frames</a></li>
+<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Offers</div>
+<h2 title="Class MealOfTheWeek" class="title">Class MealOfTheWeek</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Offers.MealOfTheWeek</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MealOfTheWeek</span>
+extends java.lang.Object
+implements <a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></pre>
+<div class="block">This class is attached to a unique meal for a restaurant.
+ It's also attached to a list of customers, if a meal is attached,
+ when the user log in, he/she receive an offer from this class.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#MealOfTheWeek-Item.Meal-">MealOfTheWeek</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getMeal--">getMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getObservers--">getObservers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#isState--">isState</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setInterests-User.Restaurant-">setInterests</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setObservers-java.util.ArrayList-">setObservers</a></span>(java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setState-boolean-">setState</a></span>(boolean&nbsp;state)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MealOfTheWeek-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MealOfTheWeek</h4>
+<pre>public&nbsp;MealOfTheWeek(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="isState--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isState</h4>
+<pre>public&nbsp;boolean&nbsp;isState()</pre>
+</li>
+</ul>
+<a name="setState-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setState</h4>
+<pre>public&nbsp;void&nbsp;setState(boolean&nbsp;state)</pre>
+</li>
+</ul>
+<a name="getMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMeal</h4>
+<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;getMeal()</pre>
+</li>
+</ul>
+<a name="setMeal-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMeal</h4>
+<pre>public&nbsp;void&nbsp;setMeal(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal)</pre>
+</li>
+</ul>
+<a name="attachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>attachObserver</h4>
+<pre>public&nbsp;void&nbsp;attachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="detachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>detachObserver</h4>
+<pre>public&nbsp;void&nbsp;detachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getObservers--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getObservers</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;getObservers()</pre>
+</li>
+</ul>
+<a name="setObservers-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setObservers</h4>
+<pre>public&nbsp;void&nbsp;setObservers(java.util.ArrayList&lt;<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</pre>
+</li>
+</ul>
+<a name="notifyObservers-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>notifyObservers</h4>
+<pre>public&nbsp;void&nbsp;notifyObservers(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/ObservableOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setInterests-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setInterests</h4>
+<pre>public&nbsp;void&nbsp;setInterests(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MealOfTheWeek.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/BirthdayOffer.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/MealOfTheWeek.html" target="_top">Frames</a></li>
+<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/ObservableOffer.html b/doc/Offers/ObservableOffer.html
index 5dc9db3..b1d11b2 100644
--- a/doc/Offers/ObservableOffer.html
+++ b/doc/Offers/ObservableOffer.html
@@ -1,251 +1,251 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ObservableOffer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObservableOffer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6,"i2":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ObservableOffer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/ObservableOffer.html" target="_top">Frames</a></li>
-<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Offers</div>
-<h2 title="Interface ObservableOffer" class="title">Interface ObservableOffer</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">ObservableOffer</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#notifyall--">notifyall</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="attachObserver-Offers.Observer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>attachObserver</h4>
-<pre>void&nbsp;attachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
-</li>
-</ul>
-<a name="detachObserver-Offers.Observer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>detachObserver</h4>
-<pre>void&nbsp;detachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
-</li>
-</ul>
-<a name="notifyall--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>notifyall</h4>
-<pre>void&nbsp;notifyall()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ObservableOffer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/ObservableOffer.html" target="_top">Frames</a></li>
-<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>ObservableOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ObservableOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ObservableOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/ObservableOffer.html" target="_top">Frames</a></li>
+<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Offers</div>
+<h2 title="Interface ObservableOffer" class="title">Interface ObservableOffer</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a>, <a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">ObservableOffer</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="attachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>attachObserver</h4>
+<pre>void&nbsp;attachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="detachObserver-Offers.Observer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>detachObserver</h4>
+<pre>void&nbsp;detachObserver(<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="notifyObservers-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>notifyObservers</h4>
+<pre>void&nbsp;notifyObservers(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ObservableOffer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/ObservableOffer.html" target="_top">Frames</a></li>
+<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/Observer.html b/doc/Offers/Observer.html
index a9e1456..52c1441 100644
--- a/doc/Offers/Observer.html
+++ b/doc/Offers/Observer.html
@@ -1,225 +1,225 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>Observer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Observer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Observer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/Observer.html" target="_top">Frames</a></li>
-<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Offers</div>
-<h2 title="Interface Observer" class="title">Interface Observer</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../User/Customer.html" title="class in User">Customer</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">Observer</span></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/Observer.html#update--">update</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="update--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>update</h4>
-<pre>void&nbsp;update()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Observer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/Observer.html" target="_top">Frames</a></li>
-<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Observer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Observer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Observer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/Observer.html" target="_top">Frames</a></li>
+<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Offers</div>
+<h2 title="Interface Observer" class="title">Interface Observer</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../User/Customer.html" title="class in User">Customer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">Observer</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Offers/Observer.html#update-java.lang.String-">update</a></span>(java.lang.String&nbsp;offer)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="update-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>update</h4>
+<pre>void&nbsp;update(java.lang.String&nbsp;offer)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Observer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/Observer.html" target="_top">Frames</a></li>
+<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/class-use/BirthdayOffer.html b/doc/Offers/class-use/BirthdayOffer.html
new file mode 100644
index 0000000..19f220b
--- /dev/null
+++ b/doc/Offers/class-use/BirthdayOffer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class Offers.BirthdayOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Offers.BirthdayOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/BirthdayOffer.html" title="class in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/BirthdayOffer.html" target="_top">Frames</a></li>
+<li><a href="BirthdayOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Offers.BirthdayOffer" class="title">Uses of Class<br>Offers.BirthdayOffer</h2>
+</div>
+<div class="classUseContainer">No usage of Offers.BirthdayOffer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/BirthdayOffer.html" title="class in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/BirthdayOffer.html" target="_top">Frames</a></li>
+<li><a href="BirthdayOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/class-use/MealOfTheWeek.html b/doc/Offers/class-use/MealOfTheWeek.html
index 666b6de..f008dfe 100644
--- a/doc/Offers/class-use/MealOfTheWeek.html
+++ b/doc/Offers/class-use/MealOfTheWeek.html
@@ -1,124 +1,177 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Offers.MealOfTheWeek</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Offers.MealOfTheWeek";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/MealOfTheWeek.html" target="_top">Frames</a></li>
-<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Offers.MealOfTheWeek" class="title">Uses of Class<br>Offers.MealOfTheWeek</h2>
-</div>
-<div class="classUseContainer">No usage of Offers.MealOfTheWeek</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/MealOfTheWeek.html" target="_top">Frames</a></li>
-<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class Offers.MealOfTheWeek</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Offers.MealOfTheWeek";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/MealOfTheWeek.html" target="_top">Frames</a></li>
+<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Offers.MealOfTheWeek" class="title">Uses of Class<br>Offers.MealOfTheWeek</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#getMealOfTheWeek--">getMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Restaurant.</span><code><span class="memberNameLink"><a href="../../User/Restaurant.html#setMealOfTheWeek-Offers.MealOfTheWeek-">setMealOfTheWeek</a></span>(<a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a>&nbsp;mealOfTheWeek)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/MealOfTheWeek.html" target="_top">Frames</a></li>
+<li><a href="MealOfTheWeek.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/class-use/ObservableOffer.html b/doc/Offers/class-use/ObservableOffer.html
index f04fca0..2e65e5f 100644
--- a/doc/Offers/class-use/ObservableOffer.html
+++ b/doc/Offers/class-use/ObservableOffer.html
@@ -1,164 +1,172 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Offers.ObservableOffer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Offers.ObservableOffer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/ObservableOffer.html" title="interface in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/ObservableOffer.html" target="_top">Frames</a></li>
-<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Offers.ObservableOffer" class="title">Uses of Interface<br>Offers.ObservableOffer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Offers">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Offers">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../Offers/package-summary.html">Offers</a> that implement <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/ObservableOffer.html" title="interface in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/ObservableOffer.html" target="_top">Frames</a></li>
-<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Interface Offers.ObservableOffer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Offers.ObservableOffer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/ObservableOffer.html" title="interface in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/ObservableOffer.html" target="_top">Frames</a></li>
+<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Offers.ObservableOffer" class="title">Uses of Interface<br>Offers.ObservableOffer</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../Offers/package-summary.html">Offers</a> that implement <a href="../../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></span></code>
+<div class="block">Gives a promotion when it's the customer's birthday</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></span></code>
+<div class="block">This class is attached to a unique meal for a restaurant.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/ObservableOffer.html" title="interface in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/ObservableOffer.html" target="_top">Frames</a></li>
+<li><a href="ObservableOffer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/class-use/Observer.html b/doc/Offers/class-use/Observer.html
index 017bcd5..81e9a98 100644
--- a/doc/Offers/class-use/Observer.html
+++ b/doc/Offers/class-use/Observer.html
@@ -1,211 +1,254 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Interface Offers.Observer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface Offers.Observer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/Observer.html" title="interface in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/Observer.html" target="_top">Frames</a></li>
-<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface Offers.Observer" class="title">Uses of Interface<br>Offers.Observer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Offers">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Offers">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ObservableOffer.</span><code><span class="memberNameLink"><a href="../../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ObservableOffer.</span><code><span class="memberNameLink"><a href="../../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructor parameters in <a href="../../Offers/package-summary.html">Offers</a> with type arguments of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#MealOfTheWeek-boolean-Item.Meal-java.util.ArrayList-">MealOfTheWeek</a></span>(boolean&nbsp;state,
-             <a href="../../Item/Meal.html" title="class in Item">Meal</a>&nbsp;meal,
-             java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../User/package-summary.html">User</a> that implement <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Offers/Observer.html" title="interface in Offers">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Offers/class-use/Observer.html" target="_top">Frames</a></li>
-<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Interface Offers.Observer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Interface Offers.Observer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/Observer.html" title="interface in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/Observer.html" target="_top">Frames</a></li>
+<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Interface Offers.Observer" class="title">Uses of Interface<br>Offers.Observer</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> that return types with arguments of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#getObservers--">getObservers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">BirthdayOffer.</span><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#getObservers--">getObservers</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ObservableOffer.</span><code><span class="memberNameLink"><a href="../../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">BirthdayOffer.</span><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#attachObserver-Offers.Observer-">attachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ObservableOffer.</span><code><span class="memberNameLink"><a href="../../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">BirthdayOffer.</span><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#detachObserver-Offers.Observer-">detachObserver</a></span>(<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Offers/package-summary.html">Offers</a> with type arguments of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#setObservers-java.util.ArrayList-">setObservers</a></span>(java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">BirthdayOffer.</span><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#setObservers-java.util.ArrayList-">setObservers</a></span>(java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructor parameters in <a href="../../Offers/package-summary.html">Offers</a> with type arguments of type <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#BirthdayOffer-boolean-java.util.ArrayList-">BirthdayOffer</a></span>(boolean&nbsp;state,
+             java.util.ArrayList&lt;<a href="../../Offers/Observer.html" title="interface in Offers">Observer</a>&gt;&nbsp;observers)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../User/package-summary.html">User</a> that implement <a href="../../Offers/Observer.html" title="interface in Offers">Observer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Offers/Observer.html" title="interface in Offers">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Offers/class-use/Observer.html" target="_top">Frames</a></li>
+<li><a href="Observer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/package-frame.html b/doc/Offers/package-frame.html
index bbcf4f0..1215b5d 100644
--- a/doc/Offers/package-frame.html
+++ b/doc/Offers/package-frame.html
@@ -1,25 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Offers</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Offers/package-summary.html" target="classFrame">Offers</a></h1>
-<div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="ObservableOffer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">ObservableOffer</span></a></li>
-<li><a href="Observer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">Observer</span></a></li>
-</ul>
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="MealOfTheWeek.html" title="class in Offers" target="classFrame">MealOfTheWeek</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Offers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Offers/package-summary.html" target="classFrame">Offers</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="ObservableOffer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">ObservableOffer</span></a></li>
+<li><a href="Observer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">Observer</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="BirthdayOffer.html" title="class in Offers" target="classFrame">BirthdayOffer</a></li>
+<li><a href="MealOfTheWeek.html" title="class in Offers" target="classFrame">MealOfTheWeek</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Offers/package-summary.html b/doc/Offers/package-summary.html
index db337d9..c048875 100644
--- a/doc/Offers/package-summary.html
+++ b/doc/Offers/package-summary.html
@@ -1,161 +1,169 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Offers</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Offers";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Order/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Offers</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Offers/Observer.html" title="interface in Offers">Observer</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Order/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Offers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Offers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Order/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Offers</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Offers/Observer.html" title="interface in Offers">Observer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></td>
+<td class="colLast">
+<div class="block">Gives a promotion when it's the customer's birthday</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></td>
+<td class="colLast">
+<div class="block">This class is attached to a unique meal for a restaurant.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Order/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/package-tree.html b/doc/Offers/package-tree.html
index eb129e5..c1b2b49 100644
--- a/doc/Offers/package-tree.html
+++ b/doc/Offers/package-tree.html
@@ -1,142 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Offers Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Offers Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/package-tree.html">Prev</a></li>
-<li><a href="../Order/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Offers</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> (implements Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a></li>
-<li type="circle">Offers.<a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Item/package-tree.html">Prev</a></li>
-<li><a href="../Order/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Offers Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Offers Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/package-tree.html">Prev</a></li>
+<li><a href="../Order/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Offers</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers"><span class="typeNameLink">BirthdayOffer</span></a> (implements Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
+<li type="circle">Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> (implements Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a></li>
+<li type="circle">Offers.<a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a></li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Item/package-tree.html">Prev</a></li>
+<li><a href="../Order/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Offers/package-use.html b/doc/Offers/package-use.html
index 706129a..70e9c44 100644
--- a/doc/Offers/package-use.html
+++ b/doc/Offers/package-use.html
@@ -1,179 +1,184 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Offers</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Offers";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Offers" class="title">Uses of Package<br>Offers</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Offers">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Offers">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Offers/package-summary.html">Offers</a> used by <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Offers/class-use/ObservableOffer.html#Offers">ObservableOffer</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Offers/class-use/Observer.html#Offers">Observer</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Offers/package-summary.html">Offers</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Offers/class-use/Observer.html#User">Observer</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Offers/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:40 CEST 2017 -->
+<title>Uses of Package Offers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Offers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Offers" class="title">Uses of Package<br>Offers</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Offers/package-summary.html">Offers</a> used by <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Offers/class-use/ObservableOffer.html#Offers">ObservableOffer</a>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Offers/class-use/Observer.html#Offers">Observer</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Offers/package-summary.html">Offers</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Offers/class-use/MealOfTheWeek.html#User">MealOfTheWeek</a>
+<div class="block">This class is attached to a unique meal for a restaurant.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Offers/class-use/Observer.html#User">Observer</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Offers/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/HistoricOrder.html b/doc/Order/HistoricOrder.html
index 5d36e8d..c4c6efb 100644
--- a/doc/Order/HistoricOrder.html
+++ b/doc/Order/HistoricOrder.html
@@ -1,314 +1,319 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>HistoricOrder</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HistoricOrder";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HistoricOrder.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/HistoricOrder.html" target="_top">Frames</a></li>
-<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Order</div>
-<h2 title="Class HistoricOrder" class="title">Class HistoricOrder</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Order.HistoricOrder</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">HistoricOrder</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#HistoricOrder--">HistoricOrder</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getOrdered--">getOrdered</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="HistoricOrder--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>HistoricOrder</h4>
-<pre>public&nbsp;HistoricOrder()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addOrder-Order.Order-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addOrder</h4>
-<pre>public&nbsp;void&nbsp;addOrder(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
-</li>
-</ul>
-<a name="getOrdered--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getOrdered</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getOrdered()</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="getListOrder--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getListOrder</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOrder()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HistoricOrder.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/HistoricOrder.html" target="_top">Frames</a></li>
-<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>HistoricOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="HistoricOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HistoricOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/HistoricOrder.html" target="_top">Frames</a></li>
+<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Order</div>
+<h2 title="Class HistoricOrder" class="title">Class HistoricOrder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Order.HistoricOrder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">HistoricOrder</span>
+extends java.lang.Object</pre>
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#HistoricOrder--">HistoricOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getOrdered--">getOrdered</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/HistoricOrder.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="HistoricOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HistoricOrder</h4>
+<pre>public&nbsp;HistoricOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addOrder-Order.Order-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addOrder</h4>
+<pre>public&nbsp;void&nbsp;addOrder(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="getOrdered--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOrdered</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getOrdered()</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getListOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getListOrder</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HistoricOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/HistoricOrder.html" target="_top">Frames</a></li>
+<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/Order.html b/doc/Order/Order.html
index df335c9..eb9e189 100644
--- a/doc/Order/Order.html
+++ b/doc/Order/Order.html
@@ -1,468 +1,636 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Order</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Order";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Order.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/Order.html" target="_top">Frames</a></li>
-<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Order</div>
-<h2 title="Class Order" class="title">Class Order</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Order.Order</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>, java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Order</span>
-extends java.lang.Object
-implements <a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>, java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Order/Order.html#Order--">Order</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Dish-">add</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>
-<div class="block">AND & REMOVE</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Meal-">add</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#compareTo-Order.Order-">compareTo</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#finalize--">finalize</a></span>()</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getDate--">getDate</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
-                       <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#isFinalised--">isFinalised</a></span>()</code>
-<div class="block">GETTER AND SETTER</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Dish-">remove</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Meal-">remove</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#removeDishById-int-">removeDishById</a></span>(int&nbsp;d)</code>&nbsp;</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#removeMealById-int-">removeMealById</a></span>(int&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setPrice-double-">setPrice</a></span>(double&nbsp;price)</code>&nbsp;</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#visitPrice-Item.VisitablePrice-">visitPrice</a></span>(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Order--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Order</h4>
-<pre>public&nbsp;Order()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="finalize--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>finalize</h4>
-<pre>public&nbsp;void&nbsp;finalize()</pre>
-<div class="block">CUSTOM</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>finalize</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListOfOrderInAPeriod</h4>
-<pre>public static&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOfOrderInAPeriod(<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
-                                                                 <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</pre>
-</li>
-</ul>
-<a name="add-Item.Dish-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>add</h4>
-<pre>public&nbsp;void&nbsp;add(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
-<div class="block">AND & REMOVE</div>
-</li>
-</ul>
-<a name="add-Item.Meal-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>add</h4>
-<pre>public&nbsp;void&nbsp;add(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
-</li>
-</ul>
-<a name="remove-Item.Dish-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>remove</h4>
-<pre>public&nbsp;void&nbsp;remove(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
-</li>
-</ul>
-<a name="remove-Item.Meal-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>remove</h4>
-<pre>public&nbsp;void&nbsp;remove(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
-</li>
-</ul>
-<a name="removeDishById-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeDishById</h4>
-<pre>public&nbsp;void&nbsp;removeDishById(int&nbsp;d)</pre>
-</li>
-</ul>
-<a name="removeMealById-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeMealById</h4>
-<pre>public&nbsp;void&nbsp;removeMealById(int&nbsp;m)</pre>
-</li>
-</ul>
-<a name="isFinalised--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isFinalised</h4>
-<pre>public&nbsp;boolean&nbsp;isFinalised()</pre>
-<div class="block">GETTER AND SETTER</div>
-</li>
-</ul>
-<a name="getPrice--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPrice</h4>
-<pre>public&nbsp;double&nbsp;getPrice()</pre>
-</li>
-</ul>
-<a name="setPrice-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPrice</h4>
-<pre>public&nbsp;void&nbsp;setPrice(double&nbsp;price)</pre>
-</li>
-</ul>
-<a name="getDate--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getDate</h4>
-<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getDate()</pre>
-</li>
-</ul>
-<a name="visitPrice-Item.VisitablePrice-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>visitPrice</h4>
-<pre>public&nbsp;void&nbsp;visitPrice(<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>&nbsp;v)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice</a></code>&nbsp;in interface&nbsp;<code><a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="compareTo-Order.Order-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;compareTo(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Order.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/Order.html" target="_top">Frames</a></li>
-<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Order</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Order";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Order.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/Order.html" target="_top">Frames</a></li>
+<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Order</div>
+<h2 title="Class Order" class="title">Class Order</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Order.Order</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Order</span>
+extends java.lang.Object
+implements java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</pre>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.
+ When the order is finalized, price is calculated according to the strategyProfit.
+ Orders are also archived.
+ A Courier is selected to transmit the order to the customer.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Order/Order.html#Order--">Order</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Order/Order.html#Order-java.lang.String-User.Restaurant-">Order</a></span>(java.lang.String&nbsp;_name,
+     <a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;_restaurant)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Dish-">add</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Meal-">add</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#addItemByName-java.lang.String-">addItemByName</a></span>(java.lang.String&nbsp;string)</code>
+<div class="block">ADD & REMOVE</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#compareTo-Order.Order-">compareTo</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#finalize--">finalize</a></span>()</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#finalize-Core.MyFoodora-">finalize</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#finalize-Core.MyFoodora-Others.Date-">finalize</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+        <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;_date)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getDate--">getDate</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getListDish--">getListDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getListMeal--">getListMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
+                       <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getNameOrder--">getNameOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getPrice--">getPrice</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code><a href="../User/Restaurant.html" title="class in User">Restaurant</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#getRestaurantAttached--">getRestaurantAttached</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#isFinalised--">isFinalised</a></span>()</code>
+<div class="block">GETTER AND SETTER</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Dish-">remove</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Meal-">remove</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#removeDishById-int-">removeDishById</a></span>(int&nbsp;d)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#removeMealById-int-">removeMealById</a></span>(int&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setDate-Others.Date-">setDate</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setListDish-java.util.ArrayList-">setListDish</a></span>(java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listDish)</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setListMeal-java.util.ArrayList-">setListMeal</a></span>(java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;listMeal)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setPrice-double-">setPrice</a></span>(double&nbsp;price)</code>&nbsp;</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#setRestaurantAttached-User.Restaurant-">setRestaurantAttached</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurantAttached)</code>&nbsp;</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Order/Order.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Order--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Order</h4>
+<pre>public&nbsp;Order()</pre>
+</li>
+</ul>
+<a name="Order-java.lang.String-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Order</h4>
+<pre>public&nbsp;Order(java.lang.String&nbsp;_name,
+             <a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;_restaurant)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getNameOrder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNameOrder</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getNameOrder()</pre>
+</li>
+</ul>
+<a name="finalize--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>finalize</h4>
+<pre>public&nbsp;void&nbsp;finalize()</pre>
+<div class="block">CUSTOM</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>finalize</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="finalize-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>finalize</h4>
+<pre>public&nbsp;void&nbsp;finalize(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="finalize-Core.MyFoodora-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>finalize</h4>
+<pre>public&nbsp;void&nbsp;finalize(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                     <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;_date)</pre>
+</li>
+</ul>
+<a name="getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListOfOrderInAPeriod</h4>
+<pre>public static&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOfOrderInAPeriod(<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
+                                                                 <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</pre>
+</li>
+</ul>
+<a name="addItemByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addItemByName</h4>
+<pre>public&nbsp;void&nbsp;addItemByName(java.lang.String&nbsp;string)</pre>
+<div class="block">ADD & REMOVE</div>
+</li>
+</ul>
+<a name="add-Item.Dish-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>add</h4>
+<pre>public&nbsp;void&nbsp;add(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
+</li>
+</ul>
+<a name="add-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>add</h4>
+<pre>public&nbsp;void&nbsp;add(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
+</li>
+</ul>
+<a name="remove-Item.Dish-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>remove</h4>
+<pre>public&nbsp;void&nbsp;remove(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
+</li>
+</ul>
+<a name="remove-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>remove</h4>
+<pre>public&nbsp;void&nbsp;remove(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
+</li>
+</ul>
+<a name="removeDishById-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeDishById</h4>
+<pre>public&nbsp;void&nbsp;removeDishById(int&nbsp;d)</pre>
+</li>
+</ul>
+<a name="removeMealById-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeMealById</h4>
+<pre>public&nbsp;void&nbsp;removeMealById(int&nbsp;m)</pre>
+</li>
+</ul>
+<a name="isFinalised--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isFinalised</h4>
+<pre>public&nbsp;boolean&nbsp;isFinalised()</pre>
+<div class="block">GETTER AND SETTER</div>
+</li>
+</ul>
+<a name="getRestaurantAttached--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRestaurantAttached</h4>
+<pre>public&nbsp;<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;getRestaurantAttached()</pre>
+</li>
+</ul>
+<a name="setRestaurantAttached-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setRestaurantAttached</h4>
+<pre>public&nbsp;void&nbsp;setRestaurantAttached(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurantAttached)</pre>
+</li>
+</ul>
+<a name="getPrice--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPrice</h4>
+<pre>public&nbsp;double&nbsp;getPrice()</pre>
+</li>
+</ul>
+<a name="setPrice-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPrice</h4>
+<pre>public&nbsp;void&nbsp;setPrice(double&nbsp;price)</pre>
+</li>
+</ul>
+<a name="getDate--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDate</h4>
+<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getDate()</pre>
+</li>
+</ul>
+<a name="getListDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListDish</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getListDish()</pre>
+</li>
+</ul>
+<a name="setListDish-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListDish</h4>
+<pre>public&nbsp;void&nbsp;setListDish(java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listDish)</pre>
+</li>
+</ul>
+<a name="getListMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListMeal</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;getListMeal()</pre>
+</li>
+</ul>
+<a name="setListMeal-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListMeal</h4>
+<pre>public&nbsp;void&nbsp;setListMeal(java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;listMeal)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="setDate-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDate</h4>
+<pre>public&nbsp;void&nbsp;setDate(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</pre>
+</li>
+</ul>
+<a name="compareTo-Order.Order-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>compareTo</h4>
+<pre>public&nbsp;int&nbsp;compareTo(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Order.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/Order.html" target="_top">Frames</a></li>
+<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/class-use/HistoricOrder.html b/doc/Order/class-use/HistoricOrder.html
index f9b618e..f0aad5b 100644
--- a/doc/Order/class-use/HistoricOrder.html
+++ b/doc/Order/class-use/HistoricOrder.html
@@ -1,213 +1,213 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Order.HistoricOrder</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Order.HistoricOrder";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Order/HistoricOrder.html" title="class in Order">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Order/class-use/HistoricOrder.html" target="_top">Frames</a></li>
-<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Order.HistoricOrder" class="title">Uses of Class<br>Order.HistoricOrder</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
-                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#getHistoricOrder--">getHistoricOrder</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getHistorique--">getHistorique</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Order/HistoricOrder.html" title="class in Order">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Order/class-use/HistoricOrder.html" target="_top">Frames</a></li>
-<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class Order.HistoricOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Order.HistoricOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Order/HistoricOrder.html" title="class in Order">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Order/class-use/HistoricOrder.html" target="_top">Frames</a></li>
+<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Order.HistoricOrder" class="title">Uses of Class<br>Order.HistoricOrder</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
+                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#getHistoricOrder--">getHistoricOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getHistorique--">getHistorique</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Order/HistoricOrder.html" title="class in Order">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Order/class-use/HistoricOrder.html" target="_top">Frames</a></li>
+<li><a href="HistoricOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/class-use/Order.html b/doc/Order/class-use/Order.html
index b56c49d..4c45ba9 100644
--- a/doc/Order/class-use/Order.html
+++ b/doc/Order/class-use/Order.html
@@ -1,216 +1,347 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Order.Order</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Order.Order";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Order/Order.html" title="class in Order">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Order/class-use/Order.html" target="_top">Frames</a></li>
-<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Order.Order" class="title">Uses of Class<br>Order.Order</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return types with arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
-                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#getOrdered--">getOrdered</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#compareTo-Order.Order-">compareTo</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Order/Order.html" title="class in Order">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Order/class-use/Order.html" target="_top">Frames</a></li>
-<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class Order.Order</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Order.Order";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Order/Order.html" title="class in Order">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Order/class-use/Order.html" target="_top">Frames</a></li>
+<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Order.Order" class="title">Uses of Class<br>Order.Order</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Order/Order.html" title="class in Order">Order</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getPendingOrderByName-java.lang.String-">getPendingOrderByName</a></span>(java.lang.String&nbsp;string)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getOrderPendingList--">getOrderPendingList</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Customer.html" title="class in User">Customer</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getCustomerByOrder-Order.Order-">getCustomerByOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return types with arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
+                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#getOrdered--">getOrdered</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">HistoricOrder.</span><code><span class="memberNameLink"><a href="../../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#compareTo-Order.Order-">compareTo</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../Others/package-summary.html">Others</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return types with arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Historique.</span><code><span class="memberNameLink"><a href="../../Others/Historique.html#getListOfOrder--">getListOfOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Others/package-summary.html">Others</a> with type arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Historique.</span><code><span class="memberNameLink"><a href="../../Others/Historique.html#setListOfOrder-java.util.ArrayList-">setListOfOrder</a></span>(java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructor parameters in <a href="../../Others/package-summary.html">Others</a> with type arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Others/Historique.html#Historique-java.util.ArrayList-">Historique</a></span>(java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Order/Order.html" title="class in Order">Order</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Order/Order.html" title="class in Order">Order</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getOrderByName-java.lang.String-">getOrderByName</a></span>(java.lang.String&nbsp;string)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return types with arguments of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Order/Order.html" title="class in Order">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-">placeOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-Others.Date-">placeOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+          <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Order/Order.html" title="class in Order">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Order/class-use/Order.html" target="_top">Frames</a></li>
+<li><a href="Order.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/package-frame.html b/doc/Order/package-frame.html
index 135d5e8..efc29c9 100644
--- a/doc/Order/package-frame.html
+++ b/doc/Order/package-frame.html
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Order</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Order/package-summary.html" target="classFrame">Order</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="HistoricOrder.html" title="class in Order" target="classFrame">HistoricOrder</a></li>
-<li><a href="Order.html" title="class in Order" target="classFrame">Order</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Order</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Order/package-summary.html" target="classFrame">Order</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="HistoricOrder.html" title="class in Order" target="classFrame">HistoricOrder</a></li>
+<li><a href="Order.html" title="class in Order" target="classFrame">Order</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Order/package-summary.html b/doc/Order/package-summary.html
index c3f3cea..41f634b 100644
--- a/doc/Order/package-summary.html
+++ b/doc/Order/package-summary.html
@@ -1,146 +1,151 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Order</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Order";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Others/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Order</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Order/Order.html" title="class in Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../Others/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Order</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Order";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Others/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Order</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></td>
+<td class="colLast">
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Order/Order.html" title="class in Order">Order</a></td>
+<td class="colLast">
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../Others/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/package-tree.html b/doc/Order/package-tree.html
index c6b116c..84900dd 100644
--- a/doc/Order/package-tree.html
+++ b/doc/Order/package-tree.html
@@ -1,138 +1,138 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Order Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Order Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/package-tree.html">Prev</a></li>
-<li><a href="../Others/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Order</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Order.<a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a></li>
-<li type="circle">Order.<a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> (implements java.lang.Comparable&lt;T&gt;, Item.<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>)</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Offers/package-tree.html">Prev</a></li>
-<li><a href="../Others/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Order Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Order Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/package-tree.html">Prev</a></li>
+<li><a href="../Others/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Order</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Order.<a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a></li>
+<li type="circle">Order.<a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Offers/package-tree.html">Prev</a></li>
+<li><a href="../Others/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Order/package-use.html b/doc/Order/package-use.html
index 57fde15..ca5a274 100644
--- a/doc/Order/package-use.html
+++ b/doc/Order/package-use.html
@@ -1,201 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Order</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Order";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Order" class="title">Uses of Package<br>Order</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#Core">HistoricOrder</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#Order">HistoricOrder</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Order/class-use/Order.html#Order">Order</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#User">HistoricOrder</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Order/class-use/Order.html#User">Order</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Order/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package Order</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Order";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Order" class="title">Uses of Package<br>Order</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#Core">HistoricOrder</a>
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Order/class-use/Order.html#Core">Order</a>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#Order">HistoricOrder</a>
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Order/class-use/Order.html#Order">Order</a>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../Others/package-summary.html">Others</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Order/class-use/Order.html#Others">Order</a>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Order/package-summary.html">Order</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Order/class-use/HistoricOrder.html#User">HistoricOrder</a>
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Order/class-use/Order.html#User">Order</a>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Order/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/Adress.html b/doc/Others/Adress.html
index 964811b..9567aee 100644
--- a/doc/Others/Adress.html
+++ b/doc/Others/Adress.html
@@ -1,329 +1,347 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Adress</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adress";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Adress.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Adress.html" target="_top">Frames</a></li>
-<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Others</div>
-<h2 title="Class Adress" class="title">Class Adress</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Others.Adress</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Adress</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Adress.html#Adress-double-double-">Adress</a></span>(double&nbsp;x,
-      double&nbsp;y)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#getX--">getX</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#getY--">getY</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#setX-double-">setX</a></span>(double&nbsp;x)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#setY-double-">setY</a></span>(double&nbsp;y)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Adress-double-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Adress</h4>
-<pre>public&nbsp;Adress(double&nbsp;x,
-              double&nbsp;y)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getX--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getX</h4>
-<pre>public&nbsp;double&nbsp;getX()</pre>
-</li>
-</ul>
-<a name="setX-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setX</h4>
-<pre>public&nbsp;void&nbsp;setX(double&nbsp;x)</pre>
-</li>
-</ul>
-<a name="getY--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getY</h4>
-<pre>public&nbsp;double&nbsp;getY()</pre>
-</li>
-</ul>
-<a name="setY-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setY</h4>
-<pre>public&nbsp;void&nbsp;setY(double&nbsp;y)</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Adress.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Adress.html" target="_top">Frames</a></li>
-<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>Adress</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Adress";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Adress.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Adress.html" target="_top">Frames</a></li>
+<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class Adress" class="title">Class Adress</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.Adress</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Adress</span>
+extends java.lang.Object</pre>
+<div class="block">x,y representation of an adress</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Adress.html#Adress-double-double-">Adress</a></span>(double&nbsp;x,
+      double&nbsp;y)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../Others/Adress.html" title="class in Others">Adress</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#fromStr-java.lang.String-">fromStr</a></span>(java.lang.String&nbsp;str)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#getX--">getX</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#getY--">getY</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#setX-double-">setX</a></span>(double&nbsp;x)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#setY-double-">setY</a></span>(double&nbsp;y)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Adress.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Adress-double-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Adress</h4>
+<pre>public&nbsp;Adress(double&nbsp;x,
+              double&nbsp;y)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getX--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getX</h4>
+<pre>public&nbsp;double&nbsp;getX()</pre>
+</li>
+</ul>
+<a name="setX-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setX</h4>
+<pre>public&nbsp;void&nbsp;setX(double&nbsp;x)</pre>
+</li>
+</ul>
+<a name="getY--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getY</h4>
+<pre>public&nbsp;double&nbsp;getY()</pre>
+</li>
+</ul>
+<a name="setY-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setY</h4>
+<pre>public&nbsp;void&nbsp;setY(double&nbsp;y)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="fromStr-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>fromStr</h4>
+<pre>public static&nbsp;<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;fromStr(java.lang.String&nbsp;str)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Adress.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Adress.html" target="_top">Frames</a></li>
+<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/Date.html b/doc/Others/Date.html
index 655d1a9..8f45118 100644
--- a/doc/Others/Date.html
+++ b/doc/Others/Date.html
@@ -1,421 +1,439 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Date</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Date";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Date.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Date.html" target="_top">Frames</a></li>
-<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Others</div>
-<h2 title="Class Date" class="title">Class Date</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Others.Date</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Date</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Date.html#Date-int-int-int-">Date</a></span>(int&nbsp;year,
-    int&nbsp;month,
-    int&nbsp;day)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Date.html#Date-java.lang.String-java.lang.String-java.lang.String-">Date</a></span>(java.lang.String&nbsp;year,
-    java.lang.String&nbsp;month,
-    java.lang.String&nbsp;day)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getDay--">getDay</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntDay--">getIntDay</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntMonth--">getIntMonth</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntYear--">getIntYear</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getMonth--">getMonth</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getYear--">getYear</a></span>()</code>
-<div class="block">GETTER & SETTER</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setDay-java.lang.String-">setDay</a></span>(java.lang.String&nbsp;day)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setMonth-java.lang.String-">setMonth</a></span>(java.lang.String&nbsp;month)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setYear-java.lang.String-">setYear</a></span>(java.lang.String&nbsp;year)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#toString--">toString</a></span>()</code>
-<div class="block">OVERRIDE</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Date-java.lang.String-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Date</h4>
-<pre>public&nbsp;Date(java.lang.String&nbsp;year,
-            java.lang.String&nbsp;month,
-            java.lang.String&nbsp;day)</pre>
-<div class="block">CONSTRUCTOR</div>
-</li>
-</ul>
-<a name="Date-int-int-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Date</h4>
-<pre>public&nbsp;Date(int&nbsp;year,
-            int&nbsp;month,
-            int&nbsp;day)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getYear--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getYear</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getYear()</pre>
-<div class="block">GETTER & SETTER</div>
-</li>
-</ul>
-<a name="setYear-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setYear</h4>
-<pre>public&nbsp;void&nbsp;setYear(java.lang.String&nbsp;year)</pre>
-</li>
-</ul>
-<a name="getMonth--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMonth</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getMonth()</pre>
-</li>
-</ul>
-<a name="setMonth-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setMonth</h4>
-<pre>public&nbsp;void&nbsp;setMonth(java.lang.String&nbsp;month)</pre>
-</li>
-</ul>
-<a name="getDay--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getDay</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getDay()</pre>
-</li>
-</ul>
-<a name="setDay-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDay</h4>
-<pre>public&nbsp;void&nbsp;setDay(java.lang.String&nbsp;day)</pre>
-</li>
-</ul>
-<a name="getIntDay--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getIntDay</h4>
-<pre>public&nbsp;int&nbsp;getIntDay()</pre>
-</li>
-</ul>
-<a name="getIntMonth--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getIntMonth</h4>
-<pre>public&nbsp;int&nbsp;getIntMonth()</pre>
-</li>
-</ul>
-<a name="getIntYear--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getIntYear</h4>
-<pre>public&nbsp;int&nbsp;getIntYear()</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<div class="block">OVERRIDE</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Date.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Date.html" target="_top">Frames</a></li>
-<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>Date</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Date";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Date.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Date.html" target="_top">Frames</a></li>
+<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class Date" class="title">Class Date</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.Date</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Date</span>
+extends java.lang.Object</pre>
+<div class="block">Personal representation of an date.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Date.html#Date-int-int-int-">Date</a></span>(int&nbsp;year,
+    int&nbsp;month,
+    int&nbsp;day)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Date.html#Date-java.lang.String-java.lang.String-java.lang.String-">Date</a></span>(java.lang.String&nbsp;year,
+    java.lang.String&nbsp;month,
+    java.lang.String&nbsp;day)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#compareTo-Others.Date-">compareTo</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getDay--">getDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntDay--">getIntDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntMonth--">getIntMonth</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getIntYear--">getIntYear</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getMonth--">getMonth</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#getYear--">getYear</a></span>()</code>
+<div class="block">GETTER & SETTER</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setDay-java.lang.String-">setDay</a></span>(java.lang.String&nbsp;day)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setMonth-java.lang.String-">setMonth</a></span>(java.lang.String&nbsp;month)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#setYear-java.lang.String-">setYear</a></span>(java.lang.String&nbsp;year)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Date.html#toString--">toString</a></span>()</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Date-java.lang.String-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Date</h4>
+<pre>public&nbsp;Date(java.lang.String&nbsp;year,
+            java.lang.String&nbsp;month,
+            java.lang.String&nbsp;day)</pre>
+<div class="block">CONSTRUCTOR</div>
+</li>
+</ul>
+<a name="Date-int-int-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Date</h4>
+<pre>public&nbsp;Date(int&nbsp;year,
+            int&nbsp;month,
+            int&nbsp;day)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getYear--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getYear</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getYear()</pre>
+<div class="block">GETTER & SETTER</div>
+</li>
+</ul>
+<a name="setYear-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setYear</h4>
+<pre>public&nbsp;void&nbsp;setYear(java.lang.String&nbsp;year)</pre>
+</li>
+</ul>
+<a name="getMonth--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMonth</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getMonth()</pre>
+</li>
+</ul>
+<a name="setMonth-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMonth</h4>
+<pre>public&nbsp;void&nbsp;setMonth(java.lang.String&nbsp;month)</pre>
+</li>
+</ul>
+<a name="getDay--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDay</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getDay()</pre>
+</li>
+</ul>
+<a name="setDay-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDay</h4>
+<pre>public&nbsp;void&nbsp;setDay(java.lang.String&nbsp;day)</pre>
+</li>
+</ul>
+<a name="getIntDay--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIntDay</h4>
+<pre>public&nbsp;int&nbsp;getIntDay()</pre>
+</li>
+</ul>
+<a name="getIntMonth--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIntMonth</h4>
+<pre>public&nbsp;int&nbsp;getIntMonth()</pre>
+</li>
+</ul>
+<a name="getIntYear--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIntYear</h4>
+<pre>public&nbsp;int&nbsp;getIntYear()</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<div class="block">OVERRIDE</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="compareTo-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>compareTo</h4>
+<pre>public&nbsp;int&nbsp;compareTo(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Date.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Date.html" target="_top">Frames</a></li>
+<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/Historique.html b/doc/Others/Historique.html
new file mode 100644
index 0000000..5682c53
--- /dev/null
+++ b/doc/Others/Historique.html
@@ -0,0 +1,301 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>Historique</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Historique";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Historique.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Historique.html" target="_top">Frames</a></li>
+<li><a href="Historique.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class Historique" class="title">Class Historique</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.Historique</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Historique</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Historique.html#Historique-java.util.ArrayList-">Historique</a></span>(java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Historique.html#getListOfOrder--">getListOfOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Historique.html#setListOfOrder-java.util.ArrayList-">setListOfOrder</a></span>(java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Historique.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Historique-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Historique</h4>
+<pre>public&nbsp;Historique(java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getListOfOrder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListOfOrder</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOfOrder()</pre>
+</li>
+</ul>
+<a name="setListOfOrder-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setListOfOrder</h4>
+<pre>public&nbsp;void&nbsp;setListOfOrder(java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;listOfOrder)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Historique.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Historique.html" target="_top">Frames</a></li>
+<li><a href="Historique.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/IDCard.html b/doc/Others/IDCard.html
index 5dd9669..420d007 100644
--- a/doc/Others/IDCard.html
+++ b/doc/Others/IDCard.html
@@ -1,250 +1,256 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>IDCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="IDCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9,"i1":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/IDCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/IDCard.html" target="_top">Frames</a></li>
-<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Others</div>
-<h2 title="Class IDCard" class="title">Class IDCard</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Others.IDCard</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">IDCard</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../Others/IDCard.html" title="class in Others">IDCard</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/IDCard.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/IDCard.html#getNextSerialNumber--">getNextSerialNumber</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getInstance--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../Others/IDCard.html" title="class in Others">IDCard</a>&nbsp;getInstance()</pre>
-</li>
-</ul>
-<a name="getNextSerialNumber--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getNextSerialNumber</h4>
-<pre>public&nbsp;long&nbsp;getNextSerialNumber()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/IDCard.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/IDCard.html" target="_top">Frames</a></li>
-<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>IDCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="IDCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/IDCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/IDCard.html" target="_top">Frames</a></li>
+<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class IDCard" class="title">Class IDCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.IDCard</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">IDCard</span>
+extends java.lang.Object</pre>
+<div class="block">Allow to create unique numbers, especially usefull when creating new
+ fidelity cards.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../Others/IDCard.html" title="class in Others">IDCard</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/IDCard.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/IDCard.html#getNextSerialNumber--">getNextSerialNumber</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getInstance--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInstance</h4>
+<pre>public static&nbsp;<a href="../Others/IDCard.html" title="class in Others">IDCard</a>&nbsp;getInstance()</pre>
+</li>
+</ul>
+<a name="getNextSerialNumber--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getNextSerialNumber</h4>
+<pre>public&nbsp;long&nbsp;getNextSerialNumber()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/IDCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/IDCard.html" target="_top">Frames</a></li>
+<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/Period.html b/doc/Others/Period.html
index 41fcbf5..8ac49fe 100644
--- a/doc/Others/Period.html
+++ b/doc/Others/Period.html
@@ -1,312 +1,317 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Period</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Period";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Period.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Period.html" target="_top">Frames</a></li>
-<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Others</div>
-<h2 title="Class Period" class="title">Class Period</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Others.Period</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Period</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Period.html#Period-Others.Date-Others.Date-">Period</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
-      <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#getEndOfPeriod--">getEndOfPeriod</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Period-Others.Date-Others.Date-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Period</h4>
-<pre>public&nbsp;Period(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
-              <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getBeginingOfPeriod--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getBeginingOfPeriod</h4>
-<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getBeginingOfPeriod()</pre>
-</li>
-</ul>
-<a name="setBeginingOfPeriod-Others.Date-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setBeginingOfPeriod</h4>
-<pre>public&nbsp;void&nbsp;setBeginingOfPeriod(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</pre>
-</li>
-</ul>
-<a name="getEndOfPeriod--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getEndOfPeriod</h4>
-<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getEndOfPeriod()</pre>
-</li>
-</ul>
-<a name="setEndOfPeriod-Others.Date-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setEndOfPeriod</h4>
-<pre>public&nbsp;void&nbsp;setEndOfPeriod(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Period.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Period.html" target="_top">Frames</a></li>
-<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>Period</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Period";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Period.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Period.html" target="_top">Frames</a></li>
+<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class Period" class="title">Class Period</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.Period</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Period</span>
+extends java.lang.Object</pre>
+<div class="block">period between two date representation</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Period.html#Period-Others.Date-Others.Date-">Period</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
+      <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#getEndOfPeriod--">getEndOfPeriod</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod</a></span>(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Period-Others.Date-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Period</h4>
+<pre>public&nbsp;Period(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
+              <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getBeginingOfPeriod--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getBeginingOfPeriod</h4>
+<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getBeginingOfPeriod()</pre>
+</li>
+</ul>
+<a name="setBeginingOfPeriod-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setBeginingOfPeriod</h4>
+<pre>public&nbsp;void&nbsp;setBeginingOfPeriod(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</pre>
+</li>
+</ul>
+<a name="getEndOfPeriod--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getEndOfPeriod</h4>
+<pre>public&nbsp;<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;getEndOfPeriod()</pre>
+</li>
+</ul>
+<a name="setEndOfPeriod-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setEndOfPeriod</h4>
+<pre>public&nbsp;void&nbsp;setEndOfPeriod(<a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Period.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Period.html" target="_top">Frames</a></li>
+<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/Position.html b/doc/Others/Position.html
index 1a54026..ca6ec9f 100644
--- a/doc/Others/Position.html
+++ b/doc/Others/Position.html
@@ -1,329 +1,329 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Position</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Position";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Position.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Position.html" target="_top">Frames</a></li>
-<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">Others</div>
-<h2 title="Class Position" class="title">Class Position</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>Others.Position</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Position</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Position.html#Position-double-double-">Position</a></span>(double&nbsp;x,
-        double&nbsp;y)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#getX--">getX</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#getY--">getY</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#setX-double-">setX</a></span>(double&nbsp;x)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#setY-double-">setY</a></span>(double&nbsp;y)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Position-double-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Position</h4>
-<pre>public&nbsp;Position(double&nbsp;x,
-                double&nbsp;y)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="getX--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getX</h4>
-<pre>public&nbsp;double&nbsp;getX()</pre>
-</li>
-</ul>
-<a name="setX-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setX</h4>
-<pre>public&nbsp;void&nbsp;setX(double&nbsp;x)</pre>
-</li>
-</ul>
-<a name="getY--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getY</h4>
-<pre>public&nbsp;double&nbsp;getY()</pre>
-</li>
-</ul>
-<a name="setY-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setY</h4>
-<pre>public&nbsp;void&nbsp;setY(double&nbsp;y)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Position.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/Position.html" target="_top">Frames</a></li>
-<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:30 CEST 2017 -->
+<title>Position</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Position";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Position.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Position.html" target="_top">Frames</a></li>
+<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">Others</div>
+<h2 title="Class Position" class="title">Class Position</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>Others.Position</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Position</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../Others/Position.html#Position-double-double-">Position</a></span>(double&nbsp;x,
+        double&nbsp;y)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#getX--">getX</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#getY--">getY</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#setX-double-">setX</a></span>(double&nbsp;x)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#setY-double-">setY</a></span>(double&nbsp;y)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../Others/Position.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Position-double-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Position</h4>
+<pre>public&nbsp;Position(double&nbsp;x,
+                double&nbsp;y)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getX--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getX</h4>
+<pre>public&nbsp;double&nbsp;getX()</pre>
+</li>
+</ul>
+<a name="setX-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setX</h4>
+<pre>public&nbsp;void&nbsp;setX(double&nbsp;x)</pre>
+</li>
+</ul>
+<a name="getY--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getY</h4>
+<pre>public&nbsp;double&nbsp;getY()</pre>
+</li>
+</ul>
+<a name="setY-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setY</h4>
+<pre>public&nbsp;void&nbsp;setY(double&nbsp;y)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Position.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/Position.html" target="_top">Frames</a></li>
+<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/Adress.html b/doc/Others/class-use/Adress.html
index a1cba3a..6b4440d 100644
--- a/doc/Others/class-use/Adress.html
+++ b/doc/Others/class-use/Adress.html
@@ -1,368 +1,397 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Others.Adress</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Others.Adress";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Adress.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Adress.html" target="_top">Frames</a></li>
-<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Others.Adress" class="title">Uses of Class<br>Others.Adress</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Adress.html" title="class in Others">Adress</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Others/Adress.html" title="class in Others">Adress</a></code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#getAdress--">getAdress</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname,
-       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-       int&nbsp;typeOfUser,
-       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#setAdress-Others.Adress-">setAdress</a></span>(<a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-boolean-">Customer</a></span>(long&nbsp;phoneNumber,
-        java.lang.String&nbsp;name,
-        java.lang.String&nbsp;username,
-        java.lang.String&nbsp;mail,
-        java.lang.String&nbsp;password,
-        <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-        boolean&nbsp;activated,
-        java.lang.String&nbsp;birthdayDate,
-        java.lang.String&nbsp;surname,
-        boolean&nbsp;spamAgree)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser</a></span>(long&nbsp;phoneNumber,
-         java.lang.String&nbsp;name,
-         java.lang.String&nbsp;username,
-         java.lang.String&nbsp;mail,
-         java.lang.String&nbsp;password,
-         <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-         boolean&nbsp;activated,
-         java.lang.String&nbsp;birthdayDate,
-         java.lang.String&nbsp;surname)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser</a></span>(long&nbsp;phoneNumber,
-         java.lang.String&nbsp;name,
-         java.lang.String&nbsp;username,
-         java.lang.String&nbsp;mail,
-         java.lang.String&nbsp;password,
-         <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-         boolean&nbsp;activated)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant</a></span>(long&nbsp;phoneNumber,
-          java.lang.String&nbsp;name,
-          java.lang.String&nbsp;username,
-          java.lang.String&nbsp;mail,
-          java.lang.String&nbsp;password,
-          <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-          boolean&nbsp;activated)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User</a></span>(long&nbsp;phoneNumber,
-    java.lang.String&nbsp;name,
-    java.lang.String&nbsp;username,
-    java.lang.String&nbsp;mail,
-    java.lang.String&nbsp;password,
-    <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-    boolean&nbsp;activated)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Adress.html" title="class in Others">Adress</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>abstract <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>abstract <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Adress.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Adress.html" target="_top">Frames</a></li>
-<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.Adress</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.Adress";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Adress.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Adress.html" target="_top">Frames</a></li>
+<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.Adress" class="title">Uses of Class<br>Others.Adress</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Adress.html" title="class in Others">Adress</a> in <a href="../../Others/package-summary.html">Others</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../Others/Adress.html" title="class in Others">Adress</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Adress.</span><code><span class="memberNameLink"><a href="../../Others/Adress.html#fromStr-java.lang.String-">fromStr</a></span>(java.lang.String&nbsp;str)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Adress.html" title="class in Others">Adress</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Others/Adress.html" title="class in Others">Adress</a></code></td>
+<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#getAdress--">getAdress</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname,
+       <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       int&nbsp;typeOfUser,
+       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../User/UserFactory.html#createUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">createUser</a></span>(long&nbsp;phoneNumber,
+          java.lang.String&nbsp;name,
+          java.lang.String&nbsp;username,
+          java.lang.String&nbsp;mail,
+          java.lang.String&nbsp;password,
+          <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+          boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#setAdress-Others.Adress-">setAdress</a></span>(<a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Customer</a></span>(long&nbsp;phoneNumber,
+        java.lang.String&nbsp;name,
+        java.lang.String&nbsp;username,
+        java.lang.String&nbsp;mail,
+        java.lang.String&nbsp;password,
+        <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+        boolean&nbsp;activated,
+        java.lang.String&nbsp;birthdayDate,
+        java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser</a></span>(long&nbsp;phoneNumber,
+         java.lang.String&nbsp;name,
+         java.lang.String&nbsp;username,
+         java.lang.String&nbsp;mail,
+         java.lang.String&nbsp;password,
+         <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+         boolean&nbsp;activated,
+         java.lang.String&nbsp;birthdayDate,
+         java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser</a></span>(long&nbsp;phoneNumber,
+         java.lang.String&nbsp;name,
+         java.lang.String&nbsp;username,
+         java.lang.String&nbsp;mail,
+         java.lang.String&nbsp;password,
+         <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+         boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant</a></span>(long&nbsp;phoneNumber,
+          java.lang.String&nbsp;name,
+          java.lang.String&nbsp;username,
+          java.lang.String&nbsp;mail,
+          java.lang.String&nbsp;password,
+          <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+          boolean&nbsp;activated)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User</a></span>(long&nbsp;phoneNumber,
+    java.lang.String&nbsp;name,
+    java.lang.String&nbsp;username,
+    java.lang.String&nbsp;mail,
+    java.lang.String&nbsp;password,
+    <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+    boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Adress.html" title="class in Others">Adress</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> with parameters of type <a href="../../Others/Adress.html" title="class in Others">Adress</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Adress.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Adress.html" target="_top">Frames</a></li>
+<li><a href="Adress.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/Date.html b/doc/Others/class-use/Date.html
index 54d586c..beb0e6d 100644
--- a/doc/Others/class-use/Date.html
+++ b/doc/Others/class-use/Date.html
@@ -1,219 +1,288 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Others.Date</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Others.Date";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Date.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Date.html" target="_top">Frames</a></li>
-<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Others.Date" class="title">Uses of Class<br>Others.Date</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Others">Others</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getDate--">getDate</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Others">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../Others/package-summary.html">Others</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#getEndOfPeriod--">getEndOfPeriod</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../Others/package-summary.html">Others</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../Others/Period.html#Period-Others.Date-Others.Date-">Period</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
-      <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Date.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Date.html" target="_top">Frames</a></li>
-<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.Date</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.Date";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Date.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Date.html" target="_top">Frames</a></li>
+<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.Date" class="title">Uses of Class<br>Others.Date</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getProfitBetween-Others.Date-Others.Date-">getProfitBetween</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;dateBeg,
+                <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;dateEnd)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getDate--">getDate</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#finalize-Core.MyFoodora-Others.Date-">finalize</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+        <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;_date)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#setDate-Others.Date-">setDate</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../Others/package-summary.html">Others</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../Others/Date.html" title="class in Others">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#getEndOfPeriod--">getEndOfPeriod</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span class="typeNameLabel">Date.</span><code><span class="memberNameLink"><a href="../../Others/Date.html#compareTo-Others.Date-">compareTo</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Period.</span><code><span class="memberNameLink"><a href="../../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Others/package-summary.html">Others</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Others/Period.html#Period-Others.Date-Others.Date-">Period</a></span>(<a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;beginingOfPeriod,
+      <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;endOfPeriod)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Date.html" title="class in Others">Date</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Date.html" title="class in Others">Date</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-Others.Date-">placeOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+          <a href="../../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Date.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Date.html" target="_top">Frames</a></li>
+<li><a href="Date.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/Historique.html b/doc/Others/class-use/Historique.html
new file mode 100644
index 0000000..b4e7ae2
--- /dev/null
+++ b/doc/Others/class-use/Historique.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.Historique</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.Historique";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Historique.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Historique.html" target="_top">Frames</a></li>
+<li><a href="Historique.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.Historique" class="title">Uses of Class<br>Others.Historique</h2>
+</div>
+<div class="classUseContainer">No usage of Others.Historique</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Historique.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Historique.html" target="_top">Frames</a></li>
+<li><a href="Historique.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/IDCard.html b/doc/Others/class-use/IDCard.html
index c3673ae..dc98c96 100644
--- a/doc/Others/class-use/IDCard.html
+++ b/doc/Others/class-use/IDCard.html
@@ -1,164 +1,164 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Others.IDCard</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Others.IDCard";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/IDCard.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/IDCard.html" target="_top">Frames</a></li>
-<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Others.IDCard" class="title">Uses of Class<br>Others.IDCard</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Others">Others</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Others">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/IDCard.html" title="class in Others">IDCard</a> in <a href="../../Others/package-summary.html">Others</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></code></td>
-<td class="colLast"><span class="typeNameLabel">IDCard.</span><code><span class="memberNameLink"><a href="../../Others/IDCard.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/IDCard.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/IDCard.html" target="_top">Frames</a></li>
-<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.IDCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.IDCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/IDCard.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/IDCard.html" target="_top">Frames</a></li>
+<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.IDCard" class="title">Uses of Class<br>Others.IDCard</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/IDCard.html" title="class in Others">IDCard</a> in <a href="../../Others/package-summary.html">Others</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Others/package-summary.html">Others</a> that return <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../Others/IDCard.html" title="class in Others">IDCard</a></code></td>
+<td class="colLast"><span class="typeNameLabel">IDCard.</span><code><span class="memberNameLink"><a href="../../Others/IDCard.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/IDCard.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/IDCard.html" target="_top">Frames</a></li>
+<li><a href="IDCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/Period.html b/doc/Others/class-use/Period.html
index a00dcc2..bc49953 100644
--- a/doc/Others/class-use/Period.html
+++ b/doc/Others/class-use/Period.html
@@ -1,198 +1,198 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Others.Period</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Others.Period";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Period.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Period.html" target="_top">Frames</a></li>
-<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Others.Period" class="title">Uses of Class<br>Others.Period</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Period.html" title="class in Others">Period</a> in <a href="../../Order/package-summary.html">Order</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
-                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Period.html" title="class in Others">Period</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                           <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Period.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Period.html" target="_top">Frames</a></li>
-<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.Period</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.Period";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Period.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Period.html" target="_top">Frames</a></li>
+<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.Period" class="title">Uses of Class<br>Others.Period</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Period.html" title="class in Others">Period</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.ArrayList&lt;<a href="../../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod</a></span>(<a href="../../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;historic,
+                       <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Period.html" title="class in Others">Period</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Period.html" title="class in Others">Period</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                           <a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Period.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Period.html" target="_top">Frames</a></li>
+<li><a href="Period.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/class-use/Position.html b/doc/Others/class-use/Position.html
index 16ab18c..92aa57d 100644
--- a/doc/Others/class-use/Position.html
+++ b/doc/Others/class-use/Position.html
@@ -1,177 +1,177 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class Others.Position</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class Others.Position";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Position.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Position.html" target="_top">Frames</a></li>
-<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class Others.Position" class="title">Uses of Class<br>Others.Position</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../Others/Position.html" title="class in Others">Position</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../Others/Position.html" title="class in Others">Position</a></code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#getPosition--">getPosition</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#setPosition-Others.Position-">setPosition</a></span>(<a href="../../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../Others/Position.html" title="class in Others">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?Others/class-use/Position.html" target="_top">Frames</a></li>
-<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class Others.Position</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class Others.Position";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Position.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Position.html" target="_top">Frames</a></li>
+<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class Others.Position" class="title">Uses of Class<br>Others.Position</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../Others/Position.html" title="class in Others">Position</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../Others/Position.html" title="class in Others">Position</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#getPosition--">getPosition</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../Others/Position.html" title="class in Others">Position</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#setPosition-Others.Position-">setPosition</a></span>(<a href="../../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../Others/Position.html" title="class in Others">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?Others/class-use/Position.html" target="_top">Frames</a></li>
+<li><a href="Position.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/package-frame.html b/doc/Others/package-frame.html
index 45c9a68..071916d 100644
--- a/doc/Others/package-frame.html
+++ b/doc/Others/package-frame.html
@@ -1,24 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Others</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../Others/package-summary.html" target="classFrame">Others</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="Adress.html" title="class in Others" target="classFrame">Adress</a></li>
-<li><a href="Date.html" title="class in Others" target="classFrame">Date</a></li>
-<li><a href="IDCard.html" title="class in Others" target="classFrame">IDCard</a></li>
-<li><a href="Period.html" title="class in Others" target="classFrame">Period</a></li>
-<li><a href="Position.html" title="class in Others" target="classFrame">Position</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Others</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../Others/package-summary.html" target="classFrame">Others</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Adress.html" title="class in Others" target="classFrame">Adress</a></li>
+<li><a href="Date.html" title="class in Others" target="classFrame">Date</a></li>
+<li><a href="Historique.html" title="class in Others" target="classFrame">Historique</a></li>
+<li><a href="IDCard.html" title="class in Others" target="classFrame">IDCard</a></li>
+<li><a href="Period.html" title="class in Others" target="classFrame">Period</a></li>
+<li><a href="Position.html" title="class in Others" target="classFrame">Position</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/Others/package-summary.html b/doc/Others/package-summary.html
index cb24d36..3738491 100644
--- a/doc/Others/package-summary.html
+++ b/doc/Others/package-summary.html
@@ -1,158 +1,171 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Others</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Others";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../provisoire/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;Others</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../Others/Adress.html" title="class in Others">Adress</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Others/Date.html" title="class in Others">Date</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Others/IDCard.html" title="class in Others">IDCard</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../Others/Period.html" title="class in Others">Period</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../Others/Position.html" title="class in Others">Position</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../provisoire/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Others</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Others";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;Others</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../Others/Adress.html" title="class in Others">Adress</a></td>
+<td class="colLast">
+<div class="block">x,y representation of an adress</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Others/Date.html" title="class in Others">Date</a></td>
+<td class="colLast">
+<div class="block">Personal representation of an date.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Others/Historique.html" title="class in Others">Historique</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Others/IDCard.html" title="class in Others">IDCard</a></td>
+<td class="colLast">
+<div class="block">Allow to create unique numbers, especially usefull when creating new
+ fidelity cards.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../Others/Period.html" title="class in Others">Period</a></td>
+<td class="colLast">
+<div class="block">period between two date representation</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../Others/Position.html" title="class in Others">Position</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/package-tree.html b/doc/Others/package-tree.html
index 3517fcc..ac89e9c 100644
--- a/doc/Others/package-tree.html
+++ b/doc/Others/package-tree.html
@@ -1,141 +1,142 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Others Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Others Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/package-tree.html">Prev</a></li>
-<li><a href="../provisoire/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package Others</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Others.<a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a></li>
-<li type="circle">Others.<a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a></li>
-<li type="circle">Others.<a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a></li>
-<li type="circle">Others.<a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a></li>
-<li type="circle">Others.<a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a></li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Order/package-tree.html">Prev</a></li>
-<li><a href="../provisoire/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Others Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Others Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/package-tree.html">Prev</a></li>
+<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package Others</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Others.<a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a></li>
+<li type="circle">Others.<a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a></li>
+<li type="circle">Others.<a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Historique</span></a></li>
+<li type="circle">Others.<a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a></li>
+<li type="circle">Others.<a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a></li>
+<li type="circle">Others.<a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Order/package-tree.html">Prev</a></li>
+<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/Others/package-use.html b/doc/Others/package-use.html
index 4e77a79..d2d4c59 100644
--- a/doc/Others/package-use.html
+++ b/doc/Others/package-use.html
@@ -1,226 +1,272 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package Others</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package Others";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package Others" class="title">Uses of Package<br>Others</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../Others/package-summary.html">Others</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Order">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#Others">Others</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Order">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Others/class-use/Date.html#Order">Date</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Others/class-use/Period.html#Order">Period</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Others">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../Others/package-summary.html">Others</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Others/class-use/Date.html#Others">Date</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Others/class-use/IDCard.html#Others">IDCard</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Others/class-use/Adress.html#User">Adress</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../Others/class-use/Period.html#User">Period</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../Others/class-use/Position.html#User">Position</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../Others/class-use/Adress.html#UserFactoryPattern">Adress</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?Others/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package Others</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package Others";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package Others" class="title">Uses of Package<br>Others</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../Others/package-summary.html">Others</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Others">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Date.html#Core">Date</a>
+<div class="block">Personal representation of an date.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Date.html#Order">Date</a>
+<div class="block">Personal representation of an date.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Others/class-use/Period.html#Order">Period</a>
+<div class="block">period between two date representation</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Others">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../Others/package-summary.html">Others</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Adress.html#Others">Adress</a>
+<div class="block">x,y representation of an adress</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Others/class-use/Date.html#Others">Date</a>
+<div class="block">Personal representation of an date.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/IDCard.html#Others">IDCard</a>
+<div class="block">Allow to create unique numbers, especially usefull when creating new
+ fidelity cards.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Adress.html#User">Adress</a>
+<div class="block">x,y representation of an adress</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Others/class-use/Date.html#User">Date</a>
+<div class="block">Personal representation of an date.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Period.html#User">Period</a>
+<div class="block">period between two date representation</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../Others/class-use/Position.html#User">Position</a>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../Others/package-summary.html">Others</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../Others/class-use/Adress.html#UserFactoryPattern">Adress</a>
+<div class="block">x,y representation of an adress</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?Others/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/ContextTargetProfitStrategy.html b/doc/StrategyProfit/ContextTargetProfitStrategy.html
index 71e3d0e..d94b6a3 100644
--- a/doc/StrategyProfit/ContextTargetProfitStrategy.html
+++ b/doc/StrategyProfit/ContextTargetProfitStrategy.html
@@ -1,332 +1,389 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>ContextTargetProfitStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ContextTargetProfitStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextTargetProfitStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">StrategyProfit</div>
-<h2 title="Class ContextTargetProfitStrategy" class="title">Class ContextTargetProfitStrategy</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>StrategyProfit.ContextTargetProfitStrategy</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ContextTargetProfitStrategy</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-       double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="strategy">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>strategy</h4>
-<pre>public&nbsp;<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> strategy</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ContextTargetProfitStrategy-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ContextTargetProfitStrategy</h4>
-<pre>public&nbsp;ContextTargetProfitStrategy(java.lang.String&nbsp;strategyName)
-                            throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="setStrategy-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setStrategy</h4>
-<pre>public&nbsp;void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
-                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="execute-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>execute</h4>
-<pre>public&nbsp;void&nbsp;execute(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                    double&nbsp;targetProfit)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ContextTargetProfitStrategy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>ContextTargetProfitStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ContextTargetProfitStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextTargetProfitStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">StrategyProfit</div>
+<h2 title="Class ContextTargetProfitStrategy" class="title">Class ContextTargetProfitStrategy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>StrategyProfit.ContextTargetProfitStrategy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ContextTargetProfitStrategy</span>
+extends java.lang.Object
+implements <a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></pre>
+<div class="block">Context of the profit strategy. Allow the strategy to be saved and executed.
+ In fact, strategies are used to modify variable of foodora used to calculated
+ the order price.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+       double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#getStrategy--">getStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-StrategyProfit.StrategyTargetProfitPolicy-">setStrategy</a></span>(<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a>&nbsp;strategy)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy</a></span>(java.lang.String&nbsp;strategyName)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="strategy">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>strategy</h4>
+<pre>public&nbsp;<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> strategy</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ContextTargetProfitStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ContextTargetProfitStrategy</h4>
+<pre>public&nbsp;ContextTargetProfitStrategy(java.lang.String&nbsp;strategyName)
+                            throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setStrategy</h4>
+<pre>public&nbsp;void&nbsp;setStrategy(java.lang.String&nbsp;strategyName)
+                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy</a></code>&nbsp;in interface&nbsp;<code><a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="execute-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>execute</h4>
+<pre>public&nbsp;void&nbsp;execute(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                    double&nbsp;targetProfit)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getStrategy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStrategy</h4>
+<pre>public&nbsp;<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a>&nbsp;getStrategy()</pre>
+</li>
+</ul>
+<a name="setStrategy-StrategyProfit.StrategyTargetProfitPolicy-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setStrategy</h4>
+<pre>public&nbsp;void&nbsp;setStrategy(<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a>&nbsp;strategy)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ContextTargetProfitStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/StrategyTargetProfitPolicy.html b/doc/StrategyProfit/StrategyTargetProfitPolicy.html
index 1e97598..b7315bf 100644
--- a/doc/StrategyProfit/StrategyTargetProfitPolicy.html
+++ b/doc/StrategyProfit/StrategyTargetProfitPolicy.html
@@ -1,290 +1,312 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>StrategyTargetProfitPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StrategyTargetProfitPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/StrategyTargetProfitPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">StrategyProfit</div>
-<h2 title="Class StrategyTargetProfitPolicy" class="title">Class StrategyTargetProfitPolicy</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>StrategyProfit.StrategyTargetProfitPolicy</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a>, <a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a>, <a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">StrategyTargetProfitPolicy</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#StrategyTargetProfitPolicy--">StrategyTargetProfitPolicy</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="StrategyTargetProfitPolicy--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>StrategyTargetProfitPolicy</h4>
-<pre>public&nbsp;StrategyTargetProfitPolicy()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseTargetProfit-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>chooseTargetProfit</h4>
-<pre>public abstract&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                                        double&nbsp;targetProfit)</pre>
-</li>
-</ul>
-<a name="getNameOfStrategy--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getNameOfStrategy</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getNameOfStrategy()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/StrategyTargetProfitPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>StrategyTargetProfitPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="StrategyTargetProfitPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/StrategyTargetProfitPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">StrategyProfit</div>
+<h2 title="Class StrategyTargetProfitPolicy" class="title">Class StrategyTargetProfitPolicy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>StrategyProfit.StrategyTargetProfitPolicy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a>, <a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a>, <a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">StrategyTargetProfitPolicy</span>
+extends java.lang.Object</pre>
+<div class="block">Abstraction of the target profit strategy</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#StrategyTargetProfitPolicy--">StrategyTargetProfitPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="StrategyTargetProfitPolicy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>StrategyTargetProfitPolicy</h4>
+<pre>public&nbsp;StrategyTargetProfitPolicy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseTargetProfit-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>chooseTargetProfit</h4>
+<pre>public abstract&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                                        double&nbsp;targetProfit)</pre>
+</li>
+</ul>
+<a name="getNameOfStrategy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNameOfStrategy</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getNameOfStrategy()</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/StrategyTargetProfitPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/TargetProfitDeliveryCost.html b/doc/StrategyProfit/TargetProfitDeliveryCost.html
index 3566c04..0b1275f 100644
--- a/doc/StrategyProfit/TargetProfitDeliveryCost.html
+++ b/doc/StrategyProfit/TargetProfitDeliveryCost.html
@@ -1,289 +1,294 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>TargetProfitDeliveryCost</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TargetProfitDeliveryCost";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitDeliveryCost.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">StrategyProfit</div>
-<h2 title="Class TargetProfitDeliveryCost" class="title">Class TargetProfitDeliveryCost</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
-<li>
-<ul class="inheritance">
-<li>StrategyProfit.TargetProfitDeliveryCost</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">TargetProfitDeliveryCost</span>
-extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#TargetProfitDeliveryCost--">TargetProfitDeliveryCost</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
-<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="TargetProfitDeliveryCost--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>TargetProfitDeliveryCost</h4>
-<pre>public&nbsp;TargetProfitDeliveryCost()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseTargetProfit-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseTargetProfit</h4>
-<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                               double&nbsp;targetProfit)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitDeliveryCost.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TargetProfitDeliveryCost</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TargetProfitDeliveryCost";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitDeliveryCost.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">StrategyProfit</div>
+<h2 title="Class TargetProfitDeliveryCost" class="title">Class TargetProfitDeliveryCost</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
+<li>
+<ul class="inheritance">
+<li>StrategyProfit.TargetProfitDeliveryCost</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TargetProfitDeliveryCost</span>
+extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
+<div class="block">Strategy which focus on the delivery cost.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#TargetProfitDeliveryCost--">TargetProfitDeliveryCost</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
+<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a>, <a href="../StrategyProfit/StrategyTargetProfitPolicy.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TargetProfitDeliveryCost--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TargetProfitDeliveryCost</h4>
+<pre>public&nbsp;TargetProfitDeliveryCost()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseTargetProfit-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseTargetProfit</h4>
+<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                               double&nbsp;targetProfit)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitDeliveryCost.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/TargetProfitMarkup.html b/doc/StrategyProfit/TargetProfitMarkup.html
index 971cb8a..335a9da 100644
--- a/doc/StrategyProfit/TargetProfitMarkup.html
+++ b/doc/StrategyProfit/TargetProfitMarkup.html
@@ -1,289 +1,294 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>TargetProfitMarkup</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TargetProfitMarkup";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitMarkup.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitMarkup.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">StrategyProfit</div>
-<h2 title="Class TargetProfitMarkup" class="title">Class TargetProfitMarkup</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
-<li>
-<ul class="inheritance">
-<li>StrategyProfit.TargetProfitMarkup</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">TargetProfitMarkup</span>
-extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#TargetProfitMarkup--">TargetProfitMarkup</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
-<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="TargetProfitMarkup--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>TargetProfitMarkup</h4>
-<pre>public&nbsp;TargetProfitMarkup()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseTargetProfit-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseTargetProfit</h4>
-<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                               double&nbsp;targetProfit)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitMarkup.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitMarkup.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TargetProfitMarkup</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TargetProfitMarkup";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitMarkup.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitMarkup.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">StrategyProfit</div>
+<h2 title="Class TargetProfitMarkup" class="title">Class TargetProfitMarkup</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
+<li>
+<ul class="inheritance">
+<li>StrategyProfit.TargetProfitMarkup</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TargetProfitMarkup</span>
+extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
+<div class="block">Strategy which focus on the markup.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#TargetProfitMarkup--">TargetProfitMarkup</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
+<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a>, <a href="../StrategyProfit/StrategyTargetProfitPolicy.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TargetProfitMarkup--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TargetProfitMarkup</h4>
+<pre>public&nbsp;TargetProfitMarkup()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseTargetProfit-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseTargetProfit</h4>
+<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                               double&nbsp;targetProfit)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitMarkup.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitMarkup.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/TargetProfitServiceFee.html b/doc/StrategyProfit/TargetProfitServiceFee.html
index 4c4236f..8b01f77 100644
--- a/doc/StrategyProfit/TargetProfitServiceFee.html
+++ b/doc/StrategyProfit/TargetProfitServiceFee.html
@@ -1,289 +1,294 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:24 CEST 2017 -->
-<title>TargetProfitServiceFee</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TargetProfitServiceFee";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitServiceFee.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitServiceFee.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">StrategyProfit</div>
-<h2 title="Class TargetProfitServiceFee" class="title">Class TargetProfitServiceFee</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
-<li>
-<ul class="inheritance">
-<li>StrategyProfit.TargetProfitServiceFee</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">TargetProfitServiceFee</span>
-extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#TargetProfitServiceFee--">TargetProfitServiceFee</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                  double&nbsp;targetProfit)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
-<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="TargetProfitServiceFee--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>TargetProfitServiceFee</h4>
-<pre>public&nbsp;TargetProfitServiceFee()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="chooseTargetProfit-Core.MyFoodora-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>chooseTargetProfit</h4>
-<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
-                               double&nbsp;targetProfit)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TargetProfitServiceFee.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/TargetProfitServiceFee.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TargetProfitServiceFee</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TargetProfitServiceFee";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitServiceFee.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitServiceFee.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">StrategyProfit</div>
+<h2 title="Class TargetProfitServiceFee" class="title">Class TargetProfitServiceFee</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyProfit.StrategyTargetProfitPolicy</a></li>
+<li>
+<ul class="inheritance">
+<li>StrategyProfit.TargetProfitServiceFee</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TargetProfitServiceFee</span>
+extends <a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></pre>
+<div class="block">Strategy focused on the service fee</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#TargetProfitServiceFee--">TargetProfitServiceFee</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                  double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.StrategyProfit.StrategyTargetProfitPolicy">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></h3>
+<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy</a>, <a href="../StrategyProfit/StrategyTargetProfitPolicy.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TargetProfitServiceFee--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TargetProfitServiceFee</h4>
+<pre>public&nbsp;TargetProfitServiceFee()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="chooseTargetProfit-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>chooseTargetProfit</h4>
+<pre>public&nbsp;void&nbsp;chooseTargetProfit(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;myFoodora,
+                               double&nbsp;targetProfit)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit</a></code>&nbsp;in class&nbsp;<code><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TargetProfitServiceFee.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/TargetProfitServiceFee.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/class-use/ContextTargetProfitStrategy.html b/doc/StrategyProfit/class-use/ContextTargetProfitStrategy.html
index 2156caa..f3de061 100644
--- a/doc/StrategyProfit/class-use/ContextTargetProfitStrategy.html
+++ b/doc/StrategyProfit/class-use/ContextTargetProfitStrategy.html
@@ -1,200 +1,200 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class StrategyProfit.ContextTargetProfitStrategy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class StrategyProfit.ContextTargetProfitStrategy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class StrategyProfit.ContextTargetProfitStrategy" class="title">Uses of Class<br>StrategyProfit.ContextTargetProfitStrategy</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy</a></span>(<a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                     <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
-<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class StrategyProfit.ContextTargetProfitStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class StrategyProfit.ContextTargetProfitStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class StrategyProfit.ContextTargetProfitStrategy" class="title">Uses of Class<br>StrategyProfit.ContextTargetProfitStrategy</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy</a></span>(<a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;contextTargetProfitStrategy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                     <a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/ContextTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="ContextTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/class-use/StrategyTargetProfitPolicy.html b/doc/StrategyProfit/class-use/StrategyTargetProfitPolicy.html
index 07ee6b8..ec0eabd 100644
--- a/doc/StrategyProfit/class-use/StrategyTargetProfitPolicy.html
+++ b/doc/StrategyProfit/class-use/StrategyTargetProfitPolicy.html
@@ -1,185 +1,217 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class StrategyProfit.StrategyTargetProfitPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class StrategyProfit.StrategyTargetProfitPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class StrategyProfit.StrategyTargetProfitPolicy" class="title">Uses of Class<br>StrategyProfit.StrategyTargetProfitPolicy</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> declared as <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
-<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class StrategyProfit.StrategyTargetProfitPolicy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class StrategyProfit.StrategyTargetProfitPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class StrategyProfit.StrategyTargetProfitPolicy" class="title">Uses of Class<br>StrategyProfit.StrategyTargetProfitPolicy</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a> in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></span></code>
+<div class="block">Strategy which focus on the delivery cost.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></span></code>
+<div class="block">Strategy which focus on the markup.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></span></code>
+<div class="block">Strategy focused on the service fee</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> declared as <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> that return <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#getStrategy--">getStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../StrategyProfit/package-summary.html">StrategyProfit</a> with parameters of type <a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ContextTargetProfitStrategy.</span><code><span class="memberNameLink"><a href="../../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-StrategyProfit.StrategyTargetProfitPolicy-">setStrategy</a></span>(<a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a>&nbsp;strategy)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/StrategyTargetProfitPolicy.html" target="_top">Frames</a></li>
+<li><a href="StrategyTargetProfitPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/class-use/TargetProfitDeliveryCost.html b/doc/StrategyProfit/class-use/TargetProfitDeliveryCost.html
index cfb01d8..1541689 100644
--- a/doc/StrategyProfit/class-use/TargetProfitDeliveryCost.html
+++ b/doc/StrategyProfit/class-use/TargetProfitDeliveryCost.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class StrategyProfit.TargetProfitDeliveryCost</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class StrategyProfit.TargetProfitDeliveryCost";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class StrategyProfit.TargetProfitDeliveryCost" class="title">Uses of Class<br>StrategyProfit.TargetProfitDeliveryCost</h2>
-</div>
-<div class="classUseContainer">No usage of StrategyProfit.TargetProfitDeliveryCost</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class StrategyProfit.TargetProfitDeliveryCost</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class StrategyProfit.TargetProfitDeliveryCost";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class StrategyProfit.TargetProfitDeliveryCost" class="title">Uses of Class<br>StrategyProfit.TargetProfitDeliveryCost</h2>
+</div>
+<div class="classUseContainer">No usage of StrategyProfit.TargetProfitDeliveryCost</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitDeliveryCost.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitDeliveryCost.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/class-use/TargetProfitMarkup.html b/doc/StrategyProfit/class-use/TargetProfitMarkup.html
index 224668e..e173f5b 100644
--- a/doc/StrategyProfit/class-use/TargetProfitMarkup.html
+++ b/doc/StrategyProfit/class-use/TargetProfitMarkup.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class StrategyProfit.TargetProfitMarkup</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class StrategyProfit.TargetProfitMarkup";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitMarkup.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class StrategyProfit.TargetProfitMarkup" class="title">Uses of Class<br>StrategyProfit.TargetProfitMarkup</h2>
-</div>
-<div class="classUseContainer">No usage of StrategyProfit.TargetProfitMarkup</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitMarkup.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class StrategyProfit.TargetProfitMarkup</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class StrategyProfit.TargetProfitMarkup";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitMarkup.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class StrategyProfit.TargetProfitMarkup" class="title">Uses of Class<br>StrategyProfit.TargetProfitMarkup</h2>
+</div>
+<div class="classUseContainer">No usage of StrategyProfit.TargetProfitMarkup</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitMarkup.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitMarkup.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/class-use/TargetProfitServiceFee.html b/doc/StrategyProfit/class-use/TargetProfitServiceFee.html
index a6c204e..8393263 100644
--- a/doc/StrategyProfit/class-use/TargetProfitServiceFee.html
+++ b/doc/StrategyProfit/class-use/TargetProfitServiceFee.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class StrategyProfit.TargetProfitServiceFee</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class StrategyProfit.TargetProfitServiceFee";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitServiceFee.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class StrategyProfit.TargetProfitServiceFee" class="title">Uses of Class<br>StrategyProfit.TargetProfitServiceFee</h2>
-</div>
-<div class="classUseContainer">No usage of StrategyProfit.TargetProfitServiceFee</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitServiceFee.html" target="_top">Frames</a></li>
-<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:39 CEST 2017 -->
+<title>Uses of Class StrategyProfit.TargetProfitServiceFee</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class StrategyProfit.TargetProfitServiceFee";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitServiceFee.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class StrategyProfit.TargetProfitServiceFee" class="title">Uses of Class<br>StrategyProfit.TargetProfitServiceFee</h2>
+</div>
+<div class="classUseContainer">No usage of StrategyProfit.TargetProfitServiceFee</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?StrategyProfit/class-use/TargetProfitServiceFee.html" target="_top">Frames</a></li>
+<li><a href="TargetProfitServiceFee.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/package-frame.html b/doc/StrategyProfit/package-frame.html
index 0db26e2..c7ddaab 100644
--- a/doc/StrategyProfit/package-frame.html
+++ b/doc/StrategyProfit/package-frame.html
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>StrategyProfit</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../StrategyProfit/package-summary.html" target="classFrame">StrategyProfit</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="ContextTargetProfitStrategy.html" title="class in StrategyProfit" target="classFrame">ContextTargetProfitStrategy</a></li>
-<li><a href="StrategyTargetProfitPolicy.html" title="class in StrategyProfit" target="classFrame">StrategyTargetProfitPolicy</a></li>
-<li><a href="TargetProfitDeliveryCost.html" title="class in StrategyProfit" target="classFrame">TargetProfitDeliveryCost</a></li>
-<li><a href="TargetProfitMarkup.html" title="class in StrategyProfit" target="classFrame">TargetProfitMarkup</a></li>
-<li><a href="TargetProfitServiceFee.html" title="class in StrategyProfit" target="classFrame">TargetProfitServiceFee</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>StrategyProfit</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../StrategyProfit/package-summary.html" target="classFrame">StrategyProfit</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ContextTargetProfitStrategy.html" title="class in StrategyProfit" target="classFrame">ContextTargetProfitStrategy</a></li>
+<li><a href="StrategyTargetProfitPolicy.html" title="class in StrategyProfit" target="classFrame">StrategyTargetProfitPolicy</a></li>
+<li><a href="TargetProfitDeliveryCost.html" title="class in StrategyProfit" target="classFrame">TargetProfitDeliveryCost</a></li>
+<li><a href="TargetProfitMarkup.html" title="class in StrategyProfit" target="classFrame">TargetProfitMarkup</a></li>
+<li><a href="TargetProfitServiceFee.html" title="class in StrategyProfit" target="classFrame">TargetProfitServiceFee</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/StrategyProfit/package-summary.html b/doc/StrategyProfit/package-summary.html
index fb8b095..2240643 100644
--- a/doc/StrategyProfit/package-summary.html
+++ b/doc/StrategyProfit/package-summary.html
@@ -1,158 +1,168 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>StrategyProfit</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StrategyProfit";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../test/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;StrategyProfit</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../test/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>StrategyProfit</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="StrategyProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../test/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;StrategyProfit</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></td>
+<td class="colLast">
+<div class="block">Context of the profit strategy.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></td>
+<td class="colLast">
+<div class="block">Abstraction of the target profit strategy</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></td>
+<td class="colLast">
+<div class="block">Strategy which focus on the delivery cost.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></td>
+<td class="colLast">
+<div class="block">Strategy which focus on the markup.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></td>
+<td class="colLast">
+<div class="block">Strategy focused on the service fee</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../test/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/package-tree.html b/doc/StrategyProfit/package-tree.html
index 09b1957..888f1ca 100644
--- a/doc/StrategyProfit/package-tree.html
+++ b/doc/StrategyProfit/package-tree.html
@@ -1,144 +1,144 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>StrategyProfit Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StrategyProfit Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/package-tree.html">Prev</a></li>
-<li><a href="../test/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package StrategyProfit</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a></li>
-<li type="circle">StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a>
-<ul>
-<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a></li>
-<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a></li>
-<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/package-tree.html">Prev</a></li>
-<li><a href="../test/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>StrategyProfit Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="StrategyProfit Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-tree.html">Prev</a></li>
+<li><a href="../test/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package StrategyProfit</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a> (implements Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
+<li type="circle">StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a>
+<ul>
+<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a></li>
+<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a></li>
+<li type="circle">StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-tree.html">Prev</a></li>
+<li><a href="../test/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/StrategyProfit/package-use.html b/doc/StrategyProfit/package-use.html
index 5d607a8..feae62b 100644
--- a/doc/StrategyProfit/package-use.html
+++ b/doc/StrategyProfit/package-use.html
@@ -1,195 +1,201 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package StrategyProfit</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package StrategyProfit";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package StrategyProfit" class="title">Uses of Package<br>StrategyProfit</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../StrategyProfit/class-use/ContextTargetProfitStrategy.html#Core">ContextTargetProfitStrategy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="StrategyProfit">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../StrategyProfit/class-use/StrategyTargetProfitPolicy.html#StrategyProfit">StrategyTargetProfitPolicy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../StrategyProfit/class-use/ContextTargetProfitStrategy.html#User">ContextTargetProfitStrategy</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?StrategyProfit/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package StrategyProfit</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package StrategyProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package StrategyProfit" class="title">Uses of Package<br>StrategyProfit</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#StrategyProfit">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../StrategyProfit/class-use/ContextTargetProfitStrategy.html#Core">ContextTargetProfitStrategy</a>
+<div class="block">Context of the profit strategy.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="StrategyProfit">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../StrategyProfit/class-use/StrategyTargetProfitPolicy.html#StrategyProfit">StrategyTargetProfitPolicy</a>
+<div class="block">Abstraction of the target profit strategy</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../StrategyProfit/class-use/ContextTargetProfitStrategy.html#User">ContextTargetProfitStrategy</a>
+<div class="block">Context of the profit strategy.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?StrategyProfit/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/Courier.html b/doc/User/Courier.html
index 14f408f..6cbde11 100644
--- a/doc/User/Courier.html
+++ b/doc/User/Courier.html
@@ -1,436 +1,540 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Courier</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Courier";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Courier.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Courier.html" target="_top">Frames</a></li>
-<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class Courier" class="title">Class Courier</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
-<li>
-<ul class="inheritance">
-<li>User.Courier</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Courier</span>
-extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a></pre>
-<dl>
-<dt><span class="simpleTagLabel">Author:</span></dt>
-<dd>asus
-
-test Javadoc</dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#getNbOfLivraison--">getNbOfLivraison</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../Others/Position.html" title="class in Others">Position</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#getPosition--">getPosition</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#register-Core.MyFoodora-">register</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setAvailable--">setAvailable</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setNotAvailable--">setNotAvailable</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setPosition-Others.Position-">setPosition</a></span>(<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#unregister-Core.MyFoodora-">unregister</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Courier</h4>
-<pre>public&nbsp;Courier(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname)</pre>
-<div class="block">CONSTRUCTOR</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getPosition--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPosition</h4>
-<pre>public&nbsp;<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;getPosition()</pre>
-</li>
-</ul>
-<a name="setPosition-Others.Position-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPosition</h4>
-<pre>public&nbsp;void&nbsp;setPosition(<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</pre>
-</li>
-</ul>
-<a name="getNbOfLivraison--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getNbOfLivraison</h4>
-<pre>public&nbsp;long&nbsp;getNbOfLivraison()</pre>
-</li>
-</ul>
-<a name="setAvailable--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setAvailable</h4>
-<pre>public&nbsp;void&nbsp;setAvailable()</pre>
-</li>
-</ul>
-<a name="setNotAvailable--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setNotAvailable</h4>
-<pre>public&nbsp;void&nbsp;setNotAvailable()</pre>
-</li>
-</ul>
-<a name="register-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>register</h4>
-<pre>public&nbsp;void&nbsp;register(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="unregister-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unregister</h4>
-<pre>public&nbsp;void&nbsp;unregister(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="acceptDelivery-Order.Order-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>acceptDelivery</h4>
-<pre>public&nbsp;void&nbsp;acceptDelivery(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
-</li>
-</ul>
-<a name="refuseDelivery-Order.Order-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>refuseDelivery</h4>
-<pre>public&nbsp;void&nbsp;refuseDelivery(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Courier.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Courier.html" target="_top">Frames</a></li>
-<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Courier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Courier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Courier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Courier.html" target="_top">Frames</a></li>
+<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class Courier" class="title">Class Courier</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
+<li>
+<ul class="inheritance">
+<li>User.Courier</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Courier</span>
+extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a></pre>
+<div class="block">The Courier deliver the order from the restaurant to the customer.
+ It may accept or decline the deliver.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/Courier.html#Courier--">Courier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#compareTo-User.User-">compareTo</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;courier)</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#getNbOfLivraison--">getNbOfLivraison</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#getNbOfOrderOfTheDay--">getNbOfOrderOfTheDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../Others/Position.html" title="class in Others">Position</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#getPosition--">getPosition</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#isAvailable--">isAvailable</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#register-Core.MyFoodora-">register</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setAvailable--">setAvailable</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setAvailable-boolean-">setAvailable</a></span>(boolean&nbsp;available)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setNbOfLivraison-long-">setNbOfLivraison</a></span>(long&nbsp;nbOfLivraison)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setNotAvailable--">setNotAvailable</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#setPosition-Others.Position-">setPosition</a></span>(<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Courier.html#unregister-Core.MyFoodora-">unregister</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Courier</h4>
+<pre>public&nbsp;Courier(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname)</pre>
+<div class="block">CONSTRUCTOR</div>
+</li>
+</ul>
+<a name="Courier--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Courier</h4>
+<pre>public&nbsp;Courier()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getPosition--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPosition</h4>
+<pre>public&nbsp;<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;getPosition()</pre>
+</li>
+</ul>
+<a name="setNbOfLivraison-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNbOfLivraison</h4>
+<pre>public&nbsp;void&nbsp;setNbOfLivraison(long&nbsp;nbOfLivraison)</pre>
+</li>
+</ul>
+<a name="setPosition-Others.Position-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPosition</h4>
+<pre>public&nbsp;void&nbsp;setPosition(<a href="../Others/Position.html" title="class in Others">Position</a>&nbsp;position)</pre>
+</li>
+</ul>
+<a name="isAvailable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAvailable</h4>
+<pre>public&nbsp;boolean&nbsp;isAvailable()</pre>
+</li>
+</ul>
+<a name="setAvailable-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setAvailable</h4>
+<pre>public&nbsp;void&nbsp;setAvailable(boolean&nbsp;available)</pre>
+</li>
+</ul>
+<a name="getNbOfLivraison--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNbOfLivraison</h4>
+<pre>public&nbsp;long&nbsp;getNbOfLivraison()</pre>
+</li>
+</ul>
+<a name="setAvailable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setAvailable</h4>
+<pre>public&nbsp;void&nbsp;setAvailable()</pre>
+</li>
+</ul>
+<a name="setNotAvailable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNotAvailable</h4>
+<pre>public&nbsp;void&nbsp;setNotAvailable()</pre>
+</li>
+</ul>
+<a name="register-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>register</h4>
+<pre>public&nbsp;void&nbsp;register(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="unregister-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>unregister</h4>
+<pre>public&nbsp;void&nbsp;unregister(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="acceptDelivery-Order.Order-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptDelivery</h4>
+<pre>public&nbsp;void&nbsp;acceptDelivery(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="getNbOfOrderOfTheDay--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNbOfOrderOfTheDay</h4>
+<pre>public&nbsp;long&nbsp;getNbOfOrderOfTheDay()</pre>
+</li>
+</ul>
+<a name="refuseDelivery-Order.Order-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>refuseDelivery</h4>
+<pre>public&nbsp;void&nbsp;refuseDelivery(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../User/User.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="compareTo-User.User-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>compareTo</h4>
+<pre>public&nbsp;int&nbsp;compareTo(<a href="../User/User.html" title="class in User">User</a>&nbsp;courier)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../User/User.html#compareTo-User.User-">User</a></code></span></div>
+<div class="block">OVERRIDE</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../User/User.html#compareTo-User.User-">compareTo</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Courier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Courier.html" target="_top">Frames</a></li>
+<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/Customer.html b/doc/User/Customer.html
index 8ff329e..f65e340 100644
--- a/doc/User/Customer.html
+++ b/doc/User/Customer.html
@@ -1,468 +1,725 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Customer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Customer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Customer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Customer.html" target="_top">Frames</a></li>
-<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class Customer" class="title">Class Customer</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
-<li>
-<ul class="inheritance">
-<li>User.Customer</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>, java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;, <a href="../Offers/Observer.html" title="interface in Offers">Observer</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Customer</span>
-extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a>
-implements <a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>, <a href="../Offers/Observer.html" title="interface in Offers">Observer</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-boolean-">Customer</a></span>(long&nbsp;phoneNumber,
-        java.lang.String&nbsp;name,
-        java.lang.String&nbsp;username,
-        java.lang.String&nbsp;mail,
-        java.lang.String&nbsp;password,
-        <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-        boolean&nbsp;activated,
-        java.lang.String&nbsp;birthdayDate,
-        java.lang.String&nbsp;surname,
-        boolean&nbsp;spamAgree)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#acceptSpam--">acceptSpam</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getCard--">getCard</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getHistorique--">getHistorique</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getPointInTheCard--">getPointInTheCard</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-User.Restaurant-">placeOrder</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#refuseSpam--">refuseSpam</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#registerFidelityPlan-java.lang.String-">registerFidelityPlan</a></span>(java.lang.String&nbsp;newTypeOfFidelityCard)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#unregisterFidelityPlan-java.lang.String-">unregisterFidelityPlan</a></span>(java.lang.String&nbsp;newTypeOfFidelityCard)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#update--">update</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.VisitableCard-">visit</a></span>(<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Customer</h4>
-<pre>public&nbsp;Customer(long&nbsp;phoneNumber,
-                java.lang.String&nbsp;name,
-                java.lang.String&nbsp;username,
-                java.lang.String&nbsp;mail,
-                java.lang.String&nbsp;password,
-                <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                boolean&nbsp;activated,
-                java.lang.String&nbsp;birthdayDate,
-                java.lang.String&nbsp;surname,
-                boolean&nbsp;spamAgree)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getCard--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getCard</h4>
-<pre>public&nbsp;<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;getCard()</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../User/User.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="placeOrder-User.Restaurant-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>placeOrder</h4>
-<pre>public&nbsp;void&nbsp;placeOrder(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</pre>
-</li>
-</ul>
-<a name="registerFidelityPlan-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>registerFidelityPlan</h4>
-<pre>public&nbsp;void&nbsp;registerFidelityPlan(java.lang.String&nbsp;newTypeOfFidelityCard)</pre>
-</li>
-</ul>
-<a name="unregisterFidelityPlan-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unregisterFidelityPlan</h4>
-<pre>public&nbsp;void&nbsp;unregisterFidelityPlan(java.lang.String&nbsp;newTypeOfFidelityCard)</pre>
-</li>
-</ul>
-<a name="getHistorique--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getHistorique</h4>
-<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getHistorique()</pre>
-</li>
-</ul>
-<a name="getPointInTheCard--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPointInTheCard</h4>
-<pre>public&nbsp;long&nbsp;getPointInTheCard()</pre>
-</li>
-</ul>
-<a name="visit-Cards.VisitableCard-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>visit</h4>
-<pre>public&nbsp;long&nbsp;visit(<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>&nbsp;card)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Cards/VisiterCard.html#visit-Cards.VisitableCard-">visit</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="acceptSpam--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>acceptSpam</h4>
-<pre>public&nbsp;void&nbsp;acceptSpam()</pre>
-</li>
-</ul>
-<a name="refuseSpam--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>refuseSpam</h4>
-<pre>public&nbsp;void&nbsp;refuseSpam()</pre>
-</li>
-</ul>
-<a name="update--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>update</h4>
-<pre>public&nbsp;void&nbsp;update()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../Offers/Observer.html#update--">update</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/Observer.html" title="interface in Offers">Observer</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Customer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Customer.html" target="_top">Frames</a></li>
-<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Customer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Customer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Customer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Customer.html" target="_top">Frames</a></li>
+<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class Customer" class="title">Class Customer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
+<li>
+<ul class="inheritance">
+<li>User.Customer</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>, java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;, <a href="../Offers/Observer.html" title="interface in Offers">Observer</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Customer</span>
+extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a>
+implements <a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>, <a href="../Offers/Observer.html" title="interface in Offers">Observer</a></pre>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Customer</a></span>(long&nbsp;phoneNumber,
+        java.lang.String&nbsp;name,
+        java.lang.String&nbsp;username,
+        java.lang.String&nbsp;mail,
+        java.lang.String&nbsp;password,
+        <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+        boolean&nbsp;activated,
+        java.lang.String&nbsp;birthdayDate,
+        java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#acceptSpam--">acceptSpam</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#checkForPendingOffer--">checkForPendingOffer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#createOrder-java.lang.String-User.Restaurant-">createOrder</a></span>(java.lang.String&nbsp;name,
+           <a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getCard--">getCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getHistorique--">getHistorique</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getListOrder--">getListOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getNbOfOfferReceived--">getNbOfOfferReceived</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../Order/Order.html" title="class in Order">Order</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getOrderByName-java.lang.String-">getOrderByName</a></span>(java.lang.String&nbsp;string)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getPercentageInTheCard--">getPercentageInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#getPointInTheCard--">getPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#isSpamAgree--">isSpamAgree</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-">placeOrder</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-Others.Date-">placeOrder</a></span>(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+          <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+          <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-User.Restaurant-java.lang.String-java.util.ArrayList-Core.MyFoodora-">placeOrder</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+          java.lang.String&nbsp;mealOrDish,
+          java.util.ArrayList&lt;java.lang.String&gt;&nbsp;listOfItem,
+          <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#refuseSpam--">refuseSpam</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#registerFidelityPlan-java.lang.String-">registerFidelityPlan</a></span>(java.lang.String&nbsp;newTypeOfFidelityCard)</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#setSpamAgree-boolean-">setSpamAgree</a></span>(boolean&nbsp;spamAgree)</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#unregisterFidelityPlan--">unregisterFidelityPlan</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#update-java.lang.String-">update</a></span>(java.lang.String&nbsp;offer)</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.LotteryFidelityCard-">visit</a></span>(<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.PointFidelityCard-">visit</a></span>(<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Customer.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Customer.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Customer.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Customer.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Customer.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Customer</h4>
+<pre>public&nbsp;Customer(long&nbsp;phoneNumber,
+                java.lang.String&nbsp;name,
+                java.lang.String&nbsp;username,
+                java.lang.String&nbsp;mail,
+                java.lang.String&nbsp;password,
+                <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                boolean&nbsp;activated,
+                java.lang.String&nbsp;birthdayDate,
+                java.lang.String&nbsp;surname)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getListOrder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListOrder</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Order/Order.html" title="class in Order">Order</a>&gt;&nbsp;getListOrder()</pre>
+</li>
+</ul>
+<a name="getCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCard</h4>
+<pre>public&nbsp;<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;getCard()</pre>
+</li>
+</ul>
+<a name="isSpamAgree--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isSpamAgree</h4>
+<pre>public&nbsp;boolean&nbsp;isSpamAgree()</pre>
+</li>
+</ul>
+<a name="setSpamAgree-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setSpamAgree</h4>
+<pre>public&nbsp;void&nbsp;setSpamAgree(boolean&nbsp;spamAgree)</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../User/User.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="placeOrder-User.Restaurant-java.lang.String-java.util.ArrayList-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>placeOrder</h4>
+<pre>public&nbsp;void&nbsp;placeOrder(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+                       java.lang.String&nbsp;mealOrDish,
+                       java.util.ArrayList&lt;java.lang.String&gt;&nbsp;listOfItem,
+                       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="placeOrder-Order.Order-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>placeOrder</h4>
+<pre>public&nbsp;void&nbsp;placeOrder(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+                       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="placeOrder-Order.Order-Core.MyFoodora-Others.Date-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>placeOrder</h4>
+<pre>public&nbsp;void&nbsp;placeOrder(<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;order,
+                       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                       <a href="../Others/Date.html" title="class in Others">Date</a>&nbsp;date)</pre>
+</li>
+</ul>
+<a name="registerFidelityPlan-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerFidelityPlan</h4>
+<pre>public&nbsp;void&nbsp;registerFidelityPlan(java.lang.String&nbsp;newTypeOfFidelityCard)</pre>
+</li>
+</ul>
+<a name="unregisterFidelityPlan--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>unregisterFidelityPlan</h4>
+<pre>public&nbsp;void&nbsp;unregisterFidelityPlan()</pre>
+</li>
+</ul>
+<a name="getHistorique--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHistorique</h4>
+<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getHistorique()</pre>
+</li>
+</ul>
+<a name="getPointInTheCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPointInTheCard</h4>
+<pre>public&nbsp;long&nbsp;getPointInTheCard()</pre>
+</li>
+</ul>
+<a name="getPercentageInTheCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPercentageInTheCard</h4>
+<pre>public&nbsp;double&nbsp;getPercentageInTheCard()</pre>
+</li>
+</ul>
+<a name="visit-Cards.LotteryFidelityCard-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>visit</h4>
+<pre>public&nbsp;double&nbsp;visit(<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a>&nbsp;card)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisiterCard.html#visit-Cards.LotteryFidelityCard-">visit</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="visit-Cards.PointFidelityCard-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>visit</h4>
+<pre>public&nbsp;long&nbsp;visit(<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a>&nbsp;card)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Cards/VisiterCard.html#visit-Cards.PointFidelityCard-">visit</a></code>&nbsp;in interface&nbsp;<code><a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="acceptSpam--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptSpam</h4>
+<pre>public&nbsp;void&nbsp;acceptSpam()</pre>
+</li>
+</ul>
+<a name="refuseSpam--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>refuseSpam</h4>
+<pre>public&nbsp;void&nbsp;refuseSpam()</pre>
+</li>
+</ul>
+<a name="createOrder-java.lang.String-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createOrder</h4>
+<pre>public&nbsp;void&nbsp;createOrder(java.lang.String&nbsp;name,
+                        <a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</pre>
+</li>
+</ul>
+<a name="getOrderByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOrderByName</h4>
+<pre>public&nbsp;<a href="../Order/Order.html" title="class in Order">Order</a>&nbsp;getOrderByName(java.lang.String&nbsp;string)</pre>
+</li>
+</ul>
+<a name="checkForPendingOffer--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkForPendingOffer</h4>
+<pre>public&nbsp;void&nbsp;checkForPendingOffer()</pre>
+</li>
+</ul>
+<a name="update-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>update</h4>
+<pre>public&nbsp;void&nbsp;update(java.lang.String&nbsp;offer)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../Offers/Observer.html#update-java.lang.String-">update</a></code>&nbsp;in interface&nbsp;<code><a href="../Offers/Observer.html" title="interface in Offers">Observer</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNbOfOfferReceived--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getNbOfOfferReceived</h4>
+<pre>public&nbsp;long&nbsp;getNbOfOfferReceived()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Customer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Customer.html" target="_top">Frames</a></li>
+<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/HumanUser.html b/doc/User/HumanUser.html
index 05e3757..074df56 100644
--- a/doc/User/HumanUser.html
+++ b/doc/User/HumanUser.html
@@ -1,288 +1,305 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>HumanUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HumanUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HumanUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/HumanUser.html" target="_top">Frames</a></li>
-<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class HumanUser" class="title">Class HumanUser</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li>User.HumanUser</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../User/Courier.html" title="class in User">Courier</a>, <a href="../User/Customer.html" title="class in User">Customer</a>, <a href="../User/Manager.html" title="class in User">Manager</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">HumanUser</span>
-extends <a href="../User/User.html" title="class in User">User</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser</a></span>(long&nbsp;phoneNumber,
-         java.lang.String&nbsp;name,
-         java.lang.String&nbsp;username,
-         java.lang.String&nbsp;mail,
-         java.lang.String&nbsp;password,
-         <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-         boolean&nbsp;activated,
-         java.lang.String&nbsp;birthdayDate,
-         java.lang.String&nbsp;surname)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>HumanUser</h4>
-<pre>public&nbsp;HumanUser(long&nbsp;phoneNumber,
-                 java.lang.String&nbsp;name,
-                 java.lang.String&nbsp;username,
-                 java.lang.String&nbsp;mail,
-                 java.lang.String&nbsp;password,
-                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                 boolean&nbsp;activated,
-                 java.lang.String&nbsp;birthdayDate,
-                 java.lang.String&nbsp;surname)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HumanUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/HumanUser.html" target="_top">Frames</a></li>
-<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>HumanUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="HumanUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HumanUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/HumanUser.html" target="_top">Frames</a></li>
+<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class HumanUser" class="title">Class HumanUser</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li>User.HumanUser</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../User/Courier.html" title="class in User">Courier</a>, <a href="../User/Customer.html" title="class in User">Customer</a>, <a href="../User/Manager.html" title="class in User">Manager</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">HumanUser</span>
+extends <a href="../User/User.html" title="class in User">User</a></pre>
+<div class="block">Abstraction of human users.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser--">HumanUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser</a></span>(long&nbsp;phoneNumber,
+         java.lang.String&nbsp;name,
+         java.lang.String&nbsp;username,
+         java.lang.String&nbsp;mail,
+         java.lang.String&nbsp;password,
+         <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+         boolean&nbsp;activated,
+         java.lang.String&nbsp;birthdayDate,
+         java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>HumanUser</h4>
+<pre>public&nbsp;HumanUser(long&nbsp;phoneNumber,
+                 java.lang.String&nbsp;name,
+                 java.lang.String&nbsp;username,
+                 java.lang.String&nbsp;mail,
+                 java.lang.String&nbsp;password,
+                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                 boolean&nbsp;activated,
+                 java.lang.String&nbsp;birthdayDate,
+                 java.lang.String&nbsp;surname)</pre>
+</li>
+</ul>
+<a name="HumanUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HumanUser</h4>
+<pre>public&nbsp;HumanUser()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HumanUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/HumanUser.html" target="_top">Frames</a></li>
+<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/IDUser.html b/doc/User/IDUser.html
index ba814fd..1faee68 100644
--- a/doc/User/IDUser.html
+++ b/doc/User/IDUser.html
@@ -1,250 +1,255 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>IDUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="IDUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9,"i1":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/IDUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/IDUser.html" target="_top">Frames</a></li>
-<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class IDUser" class="title">Class IDUser</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>User.IDUser</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">IDUser</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../User/IDUser.html" title="class in User">IDUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/IDUser.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/IDUser.html#getNextSerialNumber--">getNextSerialNumber</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getInstance--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getInstance</h4>
-<pre>public static&nbsp;<a href="../User/IDUser.html" title="class in User">IDUser</a>&nbsp;getInstance()</pre>
-</li>
-</ul>
-<a name="getNextSerialNumber--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getNextSerialNumber</h4>
-<pre>public&nbsp;long&nbsp;getNextSerialNumber()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/IDUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/IDUser.html" target="_top">Frames</a></li>
-<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>IDUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="IDUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/IDUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/IDUser.html" target="_top">Frames</a></li>
+<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class IDUser" class="title">Class IDUser</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>User.IDUser</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">IDUser</span>
+extends java.lang.Object</pre>
+<div class="block">Attache an unique Id to the user.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../User/IDUser.html" title="class in User">IDUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/IDUser.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/IDUser.html#getNextSerialNumber--">getNextSerialNumber</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getInstance--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInstance</h4>
+<pre>public static&nbsp;<a href="../User/IDUser.html" title="class in User">IDUser</a>&nbsp;getInstance()</pre>
+</li>
+</ul>
+<a name="getNextSerialNumber--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getNextSerialNumber</h4>
+<pre>public&nbsp;long&nbsp;getNextSerialNumber()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/IDUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/IDUser.html" target="_top">Frames</a></li>
+<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/ListUser.html b/doc/User/ListUser.html
index 0ee10e7..8927bf5 100644
--- a/doc/User/ListUser.html
+++ b/doc/User/ListUser.html
@@ -1,368 +1,394 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>ListUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ListUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ListUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/ListUser.html" target="_top">Frames</a></li>
-<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class ListUser" class="title">Class ListUser&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>User.ListUser&lt;T&gt;</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Iterable</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">ListUser&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</span>
-extends java.lang.Object
-implements java.lang.Iterable</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/ListUser.html#ListUser--">ListUser</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#addUser-T-">addUser</a></span>(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#getList--">getList</a></span>()</code>
-<div class="block">GETTER & SETTER</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;username,
-              java.lang.String&nbsp;password)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>java.util.Iterator</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#removeUser-T-">removeUser</a></span>(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#setUseractivated-boolean-T-">setUseractivated</a></span>(boolean&nbsp;activate,
-                <a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
-<code>forEach, spliterator</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ListUser--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ListUser</h4>
-<pre>public&nbsp;ListUser()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getUserByLogin-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getUserByLogin</h4>
-<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByLogin(java.lang.String&nbsp;username,
-                           java.lang.String&nbsp;password)</pre>
-<div class="block">CUSTOM</div>
-</li>
-</ul>
-<a name="addUser-User.User-">
-<!--   -->
-</a><a name="addUser-T-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addUser</h4>
-<pre>public&nbsp;void&nbsp;addUser(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
-</li>
-</ul>
-<a name="removeUser-User.User-">
-<!--   -->
-</a><a name="removeUser-T-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeUser</h4>
-<pre>public&nbsp;void&nbsp;removeUser(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
-</li>
-</ul>
-<a name="setUseractivated-boolean-User.User-">
-<!--   -->
-</a><a name="setUseractivated-boolean-T-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setUseractivated</h4>
-<pre>public&nbsp;void&nbsp;setUseractivated(boolean&nbsp;activate,
-                             <a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
-</li>
-</ul>
-<a name="getList--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getList</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&gt;&nbsp;getList()</pre>
-<div class="block">GETTER & SETTER</div>
-</li>
-</ul>
-<a name="iterator--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>iterator</h4>
-<pre>public&nbsp;java.util.Iterator&nbsp;iterator()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>iterator</code>&nbsp;in interface&nbsp;<code>java.lang.Iterable</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/ListUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/ListUser.html" target="_top">Frames</a></li>
-<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>ListUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ListUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ListUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/ListUser.html" target="_top">Frames</a></li>
+<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class ListUser" class="title">Class ListUser&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>User.ListUser&lt;T&gt;</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - </dd>
+</dl>
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Iterable&lt;java.lang.Object&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ListUser&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</span>
+extends java.lang.Object
+implements java.lang.Iterable&lt;java.lang.Object&gt;</pre>
+<div class="block">Gives methods and form to use and manage list of users.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/ListUser.html#ListUser--">ListUser</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#addUser-T-">addUser</a></span>(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#getList--">getList</a></span>()</code>
+<div class="block">GETTER & SETTER</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;username,
+              java.lang.String&nbsp;password)</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.Iterator&lt;java.lang.Object&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#iterator--">iterator</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#removeUser-T-">removeUser</a></span>(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#setUseractivated-boolean-T-">setUseractivated</a></span>(boolean&nbsp;activate,
+                <a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/ListUser.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ListUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ListUser</h4>
+<pre>public&nbsp;ListUser()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getUserByLogin-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUserByLogin</h4>
+<pre>public&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;getUserByLogin(java.lang.String&nbsp;username,
+                           java.lang.String&nbsp;password)</pre>
+<div class="block">CUSTOM</div>
+</li>
+</ul>
+<a name="addUser-User.User-">
+<!--   -->
+</a><a name="addUser-T-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addUser</h4>
+<pre>public&nbsp;void&nbsp;addUser(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
+</li>
+</ul>
+<a name="removeUser-User.User-">
+<!--   -->
+</a><a name="removeUser-T-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeUser</h4>
+<pre>public&nbsp;void&nbsp;removeUser(<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
+</li>
+</ul>
+<a name="setUseractivated-boolean-User.User-">
+<!--   -->
+</a><a name="setUseractivated-boolean-T-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUseractivated</h4>
+<pre>public&nbsp;void&nbsp;setUseractivated(boolean&nbsp;activate,
+                             <a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&nbsp;e)</pre>
+</li>
+</ul>
+<a name="getList--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getList</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a>&gt;&nbsp;getList()</pre>
+<div class="block">GETTER & SETTER</div>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="iterator--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>iterator</h4>
+<pre>public&nbsp;java.util.Iterator&lt;java.lang.Object&gt;&nbsp;iterator()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>iterator</code>&nbsp;in interface&nbsp;<code>java.lang.Iterable&lt;java.lang.Object&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ListUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/ListUser.html" target="_top">Frames</a></li>
+<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/Manager.html b/doc/User/Manager.html
index 4cd1898..63d60c6 100644
--- a/doc/User/Manager.html
+++ b/doc/User/Manager.html
@@ -1,670 +1,723 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Manager</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Manager";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Manager.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Manager.html" target="_top">Frames</a></li>
-<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class Manager" class="title">Class Manager</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
-<li>
-<ul class="inheritance">
-<li>User.Manager</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Manager</span>
-extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#COURIER">COURIER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-            <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
-       java.lang.String&nbsp;name,
-       java.lang.String&nbsp;username,
-       java.lang.String&nbsp;mail,
-       java.lang.String&nbsp;password,
-       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-       boolean&nbsp;activated,
-       java.lang.String&nbsp;birthdayDate,
-       java.lang.String&nbsp;surname,
-       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-       int&nbsp;typeOfUser,
-       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost</a></span>(double&nbsp;newDeliveryCost,
-                  <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage</a></span>(double&nbsp;newMarkupPercentage,
-                      <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee</a></span>(double&nbsp;newServiceFee,
-                <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-               <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                           <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-              <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u,
-          <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                 <a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-<tr id="i15" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard</a></span>(<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
-                          double&nbsp;percentage)</code>&nbsp;</td>
-</tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                     <a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="UNKNOWN">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UNKNOWN</h4>
-<pre>public static final&nbsp;int UNKNOWN</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.Manager.UNKNOWN">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="COURIER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>COURIER</h4>
-<pre>public static final&nbsp;int COURIER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.Manager.COURIER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="RESTAURANT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>RESTAURANT</h4>
-<pre>public static final&nbsp;int RESTAURANT</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.Manager.RESTAURANT">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CUSTOMER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CUSTOMER</h4>
-<pre>public static final&nbsp;int CUSTOMER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.Manager.CUSTOMER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MANAGER">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MANAGER</h4>
-<pre>public static final&nbsp;int MANAGER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.Manager.MANAGER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Manager</h4>
-<pre>public&nbsp;Manager(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addUser</h4>
-<pre>public&nbsp;void&nbsp;addUser(long&nbsp;phoneNumber,
-                    java.lang.String&nbsp;name,
-                    java.lang.String&nbsp;username,
-                    java.lang.String&nbsp;mail,
-                    java.lang.String&nbsp;password,
-                    <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                    boolean&nbsp;activated,
-                    java.lang.String&nbsp;birthdayDate,
-                    java.lang.String&nbsp;surname,
-                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                    int&nbsp;typeOfUser,
-                    java.lang.String&nbsp;kindOfUser)</pre>
-</li>
-</ul>
-<a name="removeUser-User.User-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeUser</h4>
-<pre>public&nbsp;void&nbsp;removeUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u,
-                       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="changeServiceFee-double-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>changeServiceFee</h4>
-<pre>public&nbsp;void&nbsp;changeServiceFee(double&nbsp;newServiceFee,
-                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="changeMarkupPercentage-double-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>changeMarkupPercentage</h4>
-<pre>public&nbsp;void&nbsp;changeMarkupPercentage(double&nbsp;newMarkupPercentage,
-                                   <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="changeDeliveryCost-double-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>changeDeliveryCost</h4>
-<pre>public&nbsp;void&nbsp;changeDeliveryCost(double&nbsp;newDeliveryCost,
-                               <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getTotalIncome-Others.Period-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTotalIncome</h4>
-<pre>public&nbsp;double&nbsp;getTotalIncome(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getTotalProfit-Others.Period-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTotalProfit</h4>
-<pre>public&nbsp;double&nbsp;getTotalProfit(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
-                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getAverageIncomePerCustomer</h4>
-<pre>public&nbsp;double&nbsp;getAverageIncomePerCustomer(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                                          <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</pre>
-</li>
-</ul>
-<a name="setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTargetProfitPolicy</h4>
-<pre>public&nbsp;void&nbsp;setTargetProfitPolicy(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                                  <a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</pre>
-</li>
-</ul>
-<a name="setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDeliveryPolicy</h4>
-<pre>public&nbsp;void&nbsp;setDeliveryPolicy(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                              <a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</pre>
-</li>
-</ul>
-<a name="getMostSellingRestaurant-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMostSellingRestaurant</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getMostSellingRestaurant(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getLeastSellingRestaurant-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLeastSellingRestaurant</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getLeastSellingRestaurant(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getLeastActiveCourier-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLeastActiveCourier</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getLeastActiveCourier(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="getMostActiveCourier-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMostActiveCourier</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getMostActiveCourier(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-</li>
-</ul>
-<a name="activateUser-Core.MyFoodora-User.User-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>activateUser</h4>
-<pre>public&nbsp;void&nbsp;activateUser(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                         <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</pre>
-</li>
-</ul>
-<a name="desactivateUser-Core.MyFoodora-User.User-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>desactivateUser</h4>
-<pre>public&nbsp;void&nbsp;desactivateUser(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-                            <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</pre>
-</li>
-</ul>
-<a name="setProbabilityOnLoteryCard-Cards.FidelityCard-double-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setProbabilityOnLoteryCard</h4>
-<pre>public&nbsp;void&nbsp;setProbabilityOnLoteryCard(<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
-                                       double&nbsp;percentage)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Manager.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Manager.html" target="_top">Frames</a></li>
-<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Manager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Manager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Manager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Manager.html" target="_top">Frames</a></li>
+<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class Manager" class="title">Class Manager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/HumanUser.html" title="class in User">User.HumanUser</a></li>
+<li>
+<ul class="inheritance">
+<li>User.Manager</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Manager</span>
+extends <a href="../User/HumanUser.html" title="class in User">HumanUser</a></pre>
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.
+ This class contain a lot of methods describing theses abilities.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+            <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser</a></span>(long&nbsp;phoneNumber,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;username,
+       java.lang.String&nbsp;mail,
+       java.lang.String&nbsp;password,
+       <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+       boolean&nbsp;activated,
+       java.lang.String&nbsp;birthdayDate,
+       java.lang.String&nbsp;surname,
+       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+       int&nbsp;typeOfUser,
+       java.lang.String&nbsp;kindOfUser)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost</a></span>(double&nbsp;newDeliveryCost,
+                  <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage</a></span>(double&nbsp;newMarkupPercentage,
+                      <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee</a></span>(double&nbsp;newServiceFee,
+                <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+               <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#executeTargetProfitPolicy-Core.MyFoodora-double-">executeTargetProfitPolicy</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                         double&nbsp;targetProfit)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                           <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getSortedListOfDish-User.Restaurant-">getSortedListOfDish</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getSortedListOfHalfMeal-User.Restaurant-">getSortedListOfHalfMeal</a></span>(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome</a></span>(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit</a></span>(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+              <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u,
+          <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                 <a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard</a></span>(<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
+                          double&nbsp;percentage)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                     <a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Manager.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Manager.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Manager.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Manager.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.Manager.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Manager</h4>
+<pre>public&nbsp;Manager(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addUser</h4>
+<pre>public&nbsp;void&nbsp;addUser(long&nbsp;phoneNumber,
+                    java.lang.String&nbsp;name,
+                    java.lang.String&nbsp;username,
+                    java.lang.String&nbsp;mail,
+                    java.lang.String&nbsp;password,
+                    <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                    boolean&nbsp;activated,
+                    java.lang.String&nbsp;birthdayDate,
+                    java.lang.String&nbsp;surname,
+                    <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                    int&nbsp;typeOfUser,
+                    java.lang.String&nbsp;kindOfUser)
+             throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="removeUser-User.User-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeUser</h4>
+<pre>public&nbsp;void&nbsp;removeUser(<a href="../User/User.html" title="class in User">User</a>&nbsp;u,
+                       <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="changeServiceFee-double-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeServiceFee</h4>
+<pre>public&nbsp;void&nbsp;changeServiceFee(double&nbsp;newServiceFee,
+                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="changeMarkupPercentage-double-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMarkupPercentage</h4>
+<pre>public&nbsp;void&nbsp;changeMarkupPercentage(double&nbsp;newMarkupPercentage,
+                                   <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="changeDeliveryCost-double-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeDeliveryCost</h4>
+<pre>public&nbsp;void&nbsp;changeDeliveryCost(double&nbsp;newDeliveryCost,
+                               <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getTotalIncome-Others.Period-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTotalIncome</h4>
+<pre>public&nbsp;double&nbsp;getTotalIncome(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getTotalProfit-Others.Period-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTotalProfit</h4>
+<pre>public&nbsp;double&nbsp;getTotalProfit(<a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period,
+                             <a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAverageIncomePerCustomer</h4>
+<pre>public&nbsp;double&nbsp;getAverageIncomePerCustomer(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                                          <a href="../Others/Period.html" title="class in Others">Period</a>&nbsp;period)</pre>
+</li>
+</ul>
+<a name="setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTargetProfitPolicy</h4>
+<pre>public&nbsp;void&nbsp;setTargetProfitPolicy(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                                  <a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a>&nbsp;newStrategy)</pre>
+</li>
+</ul>
+<a name="setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDeliveryPolicy</h4>
+<pre>public&nbsp;void&nbsp;setDeliveryPolicy(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                              <a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a>&nbsp;newStrategy)</pre>
+</li>
+</ul>
+<a name="executeTargetProfitPolicy-Core.MyFoodora-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeTargetProfitPolicy</h4>
+<pre>public&nbsp;void&nbsp;executeTargetProfitPolicy(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                                      double&nbsp;targetProfit)</pre>
+</li>
+</ul>
+<a name="getMostSellingRestaurant-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMostSellingRestaurant</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getMostSellingRestaurant(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getLeastSellingRestaurant-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLeastSellingRestaurant</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getLeastSellingRestaurant(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getLeastActiveCourier-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLeastActiveCourier</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getLeastActiveCourier(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getMostActiveCourier-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMostActiveCourier</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getMostActiveCourier(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="activateUser-Core.MyFoodora-User.User-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>activateUser</h4>
+<pre>public&nbsp;void&nbsp;activateUser(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                         <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</pre>
+</li>
+</ul>
+<a name="desactivateUser-Core.MyFoodora-User.User-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>desactivateUser</h4>
+<pre>public&nbsp;void&nbsp;desactivateUser(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                            <a href="../User/User.html" title="class in User">User</a>&nbsp;user)</pre>
+</li>
+</ul>
+<a name="setProbabilityOnLoteryCard-Cards.FidelityCard-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setProbabilityOnLoteryCard</h4>
+<pre>public&nbsp;void&nbsp;setProbabilityOnLoteryCard(<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a>&nbsp;c,
+                                       double&nbsp;percentage)</pre>
+</li>
+</ul>
+<a name="getSortedListOfHalfMeal-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSortedListOfHalfMeal</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;&nbsp;getSortedListOfHalfMeal(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</pre>
+</li>
+</ul>
+<a name="getSortedListOfDish-User.Restaurant-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getSortedListOfDish</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getSortedListOfDish(<a href="../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Manager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Manager.html" target="_top">Frames</a></li>
+<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/MoralUser.html b/doc/User/MoralUser.html
index 0a4f2db..9048b04 100644
--- a/doc/User/MoralUser.html
+++ b/doc/User/MoralUser.html
@@ -1,284 +1,301 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>MoralUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MoralUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MoralUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/MoralUser.html" target="_top">Frames</a></li>
-<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class MoralUser" class="title">Class MoralUser</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li>User.MoralUser</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../User/Restaurant.html" title="class in User">Restaurant</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MoralUser</span>
-extends <a href="../User/User.html" title="class in User">User</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser</a></span>(long&nbsp;phoneNumber,
-         java.lang.String&nbsp;name,
-         java.lang.String&nbsp;username,
-         java.lang.String&nbsp;mail,
-         java.lang.String&nbsp;password,
-         <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-         boolean&nbsp;activated)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MoralUser</h4>
-<pre>public&nbsp;MoralUser(long&nbsp;phoneNumber,
-                 java.lang.String&nbsp;name,
-                 java.lang.String&nbsp;username,
-                 java.lang.String&nbsp;mail,
-                 java.lang.String&nbsp;password,
-                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                 boolean&nbsp;activated)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MoralUser.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/MoralUser.html" target="_top">Frames</a></li>
-<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>MoralUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MoralUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MoralUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/MoralUser.html" target="_top">Frames</a></li>
+<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class MoralUser" class="title">Class MoralUser</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li>User.MoralUser</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../User/Restaurant.html" title="class in User">Restaurant</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MoralUser</span>
+extends <a href="../User/User.html" title="class in User">User</a></pre>
+<div class="block">Abstraction of non human users.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser--">MoralUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser</a></span>(long&nbsp;phoneNumber,
+         java.lang.String&nbsp;name,
+         java.lang.String&nbsp;username,
+         java.lang.String&nbsp;mail,
+         java.lang.String&nbsp;password,
+         <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+         boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a>, <a href="../User/User.html#toString--">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MoralUser</h4>
+<pre>public&nbsp;MoralUser(long&nbsp;phoneNumber,
+                 java.lang.String&nbsp;name,
+                 java.lang.String&nbsp;username,
+                 java.lang.String&nbsp;mail,
+                 java.lang.String&nbsp;password,
+                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                 boolean&nbsp;activated)</pre>
+</li>
+</ul>
+<a name="MoralUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MoralUser</h4>
+<pre>public&nbsp;MoralUser()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MoralUser.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/MoralUser.html" target="_top">Frames</a></li>
+<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.User.User">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/Restaurant.html b/doc/User/Restaurant.html
index e5f3c22..50da611 100644
--- a/doc/User/Restaurant.html
+++ b/doc/User/Restaurant.html
@@ -1,420 +1,652 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Restaurant</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Restaurant";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Restaurant.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Restaurant.html" target="_top">Frames</a></li>
-<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class Restaurant" class="title">Class Restaurant</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/User.html" title="class in User">User.User</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../User/MoralUser.html" title="class in User">User.MoralUser</a></li>
-<li>
-<ul class="inheritance">
-<li>User.Restaurant</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">Restaurant</span>
-extends <a href="../User/MoralUser.html" title="class in User">MoralUser</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant</a></span>(long&nbsp;phoneNumber,
-          java.lang.String&nbsp;name,
-          java.lang.String&nbsp;username,
-          java.lang.String&nbsp;mail,
-          java.lang.String&nbsp;password,
-          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-          boolean&nbsp;activated)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addDish-Item.Dish-">addDish</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addMeal-Item.Meal-">addMeal</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>
-<div class="block">SETTERS</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfDish--">getListOfDish</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfMeal--">getListOfMeal</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#nameOf--">nameOf</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#removeDish-Item.Dish-">removeDish</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.User.User">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
-<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#login-Core.MyFoodora-">login</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Restaurant</h4>
-<pre>public&nbsp;Restaurant(long&nbsp;phoneNumber,
-                  java.lang.String&nbsp;name,
-                  java.lang.String&nbsp;username,
-                  java.lang.String&nbsp;mail,
-                  java.lang.String&nbsp;password,
-                  <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                  boolean&nbsp;activated)</pre>
-<div class="block">CONSTRUCTOR</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="addMeal-Item.Meal-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addMeal</h4>
-<pre>public&nbsp;void&nbsp;addMeal(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
-<div class="block">SETTERS</div>
-</li>
-</ul>
-<a name="nameOf--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>nameOf</h4>
-<pre>public&nbsp;java.lang.String&nbsp;nameOf()</pre>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../User/User.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="getListOfMeal--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListOfMeal</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;getListOfMeal()</pre>
-</li>
-</ul>
-<a name="getListOfDish--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getListOfDish</h4>
-<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getListOfDish()</pre>
-</li>
-</ul>
-<a name="addDish-Item.Dish-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>addDish</h4>
-<pre>public&nbsp;void&nbsp;addDish(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
-</li>
-</ul>
-<a name="removeMeal-Item.Meal-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>removeMeal</h4>
-<pre>public&nbsp;void&nbsp;removeMeal(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
-</li>
-</ul>
-<a name="removeDish-Item.Dish-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>removeDish</h4>
-<pre>public&nbsp;void&nbsp;removeDish(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/Restaurant.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/Restaurant.html" target="_top">Frames</a></li>
-<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>Restaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Restaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Restaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Restaurant.html" target="_top">Frames</a></li>
+<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class Restaurant" class="title">Class Restaurant</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/User.html" title="class in User">User.User</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../User/MoralUser.html" title="class in User">User.MoralUser</a></li>
+<li>
+<ul class="inheritance">
+<li>User.Restaurant</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">Restaurant</span>
+extends <a href="../User/MoralUser.html" title="class in User">MoralUser</a></pre>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#COURIER">COURIER</a>, <a href="../User/User.html#CUSTOMER">CUSTOMER</a>, <a href="../User/User.html#MANAGER">MANAGER</a>, <a href="../User/User.html#RESTAURANT">RESTAURANT</a>, <a href="../User/User.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant</a></span>(long&nbsp;phoneNumber,
+          java.lang.String&nbsp;name,
+          java.lang.String&nbsp;username,
+          java.lang.String&nbsp;mail,
+          java.lang.String&nbsp;password,
+          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+          boolean&nbsp;activated)</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addDish-java.lang.String-java.lang.String-java.lang.String-double-">addDish</a></span>(java.lang.String&nbsp;typeInMeal,
+       java.lang.String&nbsp;name,
+       java.lang.String&nbsp;typeOfFood,
+       double&nbsp;price)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addDishToMeal-Item.Dish-Item.Meal-">addDishToMeal</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d,
+             <a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addMeal-java.lang.String-java.lang.String-java.util.ArrayList-">addMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+       java.lang.String&nbsp;typeOfMeal,
+       java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listOfDish)</code>
+<div class="block">SETTERS</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#addMealOfTheWeek-Core.MyFoodora-java.lang.String-">addMealOfTheWeek</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                java.lang.String&nbsp;nameOfMeal)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#createMeal-java.lang.String-java.lang.String-">createMeal</a></span>(java.lang.String&nbsp;nameOfMeal,
+          java.lang.String&nbsp;typeOfMeal)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../Item/Dish.html" title="class in Item">Dish</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getDishByName-java.lang.String-">getDishByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getGeneralDiscountFactor--">getGeneralDiscountFactor</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../Item/Item.html" title="class in Item">Item</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getItemByName-java.lang.String-">getItemByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfDish--">getListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfMeal--">getListOfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../Item/Meal.html" title="class in Item">Meal</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getMealByName-java.lang.String-">getMealByName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code><a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getMealOfTheWeek--">getMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getSortListOfDish--">getSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getSortListOfHalfMeal--">getSortListOfHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>double</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#getSpecialDiscountFactor--">getSpecialDiscountFactor</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#nameOf--">nameOf</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#removeDish-Item.Dish-">removeDish</a></span>(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal</a></span>(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#removeMealOfTheWeek-Core.MyFoodora-">removeMealOfTheWeek</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#setGeneralDiscountFactor-double-">setGeneralDiscountFactor</a></span>(double&nbsp;generalDiscountFactor)</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#setMealOfTheWeek-Offers.MealOfTheWeek-">setMealOfTheWeek</a></span>(<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a>&nbsp;mealOfTheWeek)</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#setSpecialDiscountFactor-double-">setSpecialDiscountFactor</a></span>(double&nbsp;specialDiscountFactor)</code>&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/Restaurant.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.User.User">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;User.<a href="../User/User.html" title="class in User">User</a></h3>
+<code><a href="../User/User.html#compareTo-User.User-">compareTo</a>, <a href="../User/User.html#equals-java.lang.Object-">equals</a>, <a href="../User/User.html#getAdress--">getAdress</a>, <a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a>, <a href="../User/User.html#getId--">getId</a>, <a href="../User/User.html#getMail--">getMail</a>, <a href="../User/User.html#getName--">getName</a>, <a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a>, <a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a>, <a href="../User/User.html#getUsername--">getUsername</a>, <a href="../User/User.html#isActivated--">isActivated</a>, <a href="../User/User.html#isLogged--">isLogged</a>, <a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a>, <a href="../User/User.html#setActivated-boolean-">setActivated</a>, <a href="../User/User.html#setAdress-Others.Adress-">setAdress</a>, <a href="../User/User.html#setMail-java.lang.String-">setMail</a>, <a href="../User/User.html#setName-java.lang.String-">setName</a>, <a href="../User/User.html#setpassword-java.lang.String-">setpassword</a>, <a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a>, <a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a>, <a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Restaurant</h4>
+<pre>public&nbsp;Restaurant(long&nbsp;phoneNumber,
+                  java.lang.String&nbsp;name,
+                  java.lang.String&nbsp;username,
+                  java.lang.String&nbsp;mail,
+                  java.lang.String&nbsp;password,
+                  <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                  boolean&nbsp;activated)</pre>
+<div class="block">CONSTRUCTOR</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addMeal-java.lang.String-java.lang.String-java.util.ArrayList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addMeal</h4>
+<pre>public&nbsp;void&nbsp;addMeal(java.lang.String&nbsp;nameOfMeal,
+                    java.lang.String&nbsp;typeOfMeal,
+                    java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;listOfDish)
+             throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<div class="block">SETTERS</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="createMeal-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createMeal</h4>
+<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;createMeal(java.lang.String&nbsp;nameOfMeal,
+                       java.lang.String&nbsp;typeOfMeal)
+                throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="addDishToMeal-Item.Dish-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addDishToMeal</h4>
+<pre>public&nbsp;void&nbsp;addDishToMeal(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d,
+                          <a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
+</li>
+</ul>
+<a name="getDishByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDishByName</h4>
+<pre>public&nbsp;<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;getDishByName(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="getMealByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMealByName</h4>
+<pre>public&nbsp;<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;getMealByName(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="getItemByName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getItemByName</h4>
+<pre>public&nbsp;<a href="../Item/Item.html" title="class in Item">Item</a>&nbsp;getItemByName(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="nameOf--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nameOf</h4>
+<pre>public&nbsp;java.lang.String&nbsp;nameOf()</pre>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../User/User.html#toString--">toString</a></code>&nbsp;in class&nbsp;<code><a href="../User/User.html" title="class in User">User</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getListOfMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListOfMeal</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Meal.html" title="class in Item">Meal</a>&gt;&nbsp;getListOfMeal()</pre>
+</li>
+</ul>
+<a name="getListOfDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListOfDish</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getListOfDish()</pre>
+</li>
+</ul>
+<a name="getGeneralDiscountFactor--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGeneralDiscountFactor</h4>
+<pre>public&nbsp;double&nbsp;getGeneralDiscountFactor()</pre>
+</li>
+</ul>
+<a name="setGeneralDiscountFactor-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setGeneralDiscountFactor</h4>
+<pre>public&nbsp;void&nbsp;setGeneralDiscountFactor(double&nbsp;generalDiscountFactor)</pre>
+</li>
+</ul>
+<a name="getSpecialDiscountFactor--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSpecialDiscountFactor</h4>
+<pre>public&nbsp;double&nbsp;getSpecialDiscountFactor()</pre>
+</li>
+</ul>
+<a name="setSpecialDiscountFactor-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setSpecialDiscountFactor</h4>
+<pre>public&nbsp;void&nbsp;setSpecialDiscountFactor(double&nbsp;specialDiscountFactor)</pre>
+</li>
+</ul>
+<a name="addDish-java.lang.String-java.lang.String-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addDish</h4>
+<pre>public&nbsp;void&nbsp;addDish(java.lang.String&nbsp;typeInMeal,
+                    java.lang.String&nbsp;name,
+                    java.lang.String&nbsp;typeOfFood,
+                    double&nbsp;price)
+             throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="removeMeal-Item.Meal-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeMeal</h4>
+<pre>public&nbsp;void&nbsp;removeMeal(<a href="../Item/Meal.html" title="class in Item">Meal</a>&nbsp;m)</pre>
+</li>
+</ul>
+<a name="removeDish-Item.Dish-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeDish</h4>
+<pre>public&nbsp;void&nbsp;removeDish(<a href="../Item/Dish.html" title="class in Item">Dish</a>&nbsp;d)</pre>
+</li>
+</ul>
+<a name="getSortListOfHalfMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSortListOfHalfMeal</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;&nbsp;getSortListOfHalfMeal()</pre>
+</li>
+</ul>
+<a name="getSortListOfDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSortListOfDish</h4>
+<pre>public&nbsp;java.util.ArrayList&lt;<a href="../Item/Dish.html" title="class in Item">Dish</a>&gt;&nbsp;getSortListOfDish()</pre>
+</li>
+</ul>
+<a name="addMealOfTheWeek-Core.MyFoodora-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addMealOfTheWeek</h4>
+<pre>public&nbsp;void&nbsp;addMealOfTheWeek(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+                             java.lang.String&nbsp;nameOfMeal)</pre>
+</li>
+</ul>
+<a name="removeMealOfTheWeek-Core.MyFoodora-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeMealOfTheWeek</h4>
+<pre>public&nbsp;void&nbsp;removeMealOfTheWeek(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
+</li>
+</ul>
+<a name="getMealOfTheWeek--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMealOfTheWeek</h4>
+<pre>public&nbsp;<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a>&nbsp;getMealOfTheWeek()</pre>
+</li>
+</ul>
+<a name="setMealOfTheWeek-Offers.MealOfTheWeek-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setMealOfTheWeek</h4>
+<pre>public&nbsp;void&nbsp;setMealOfTheWeek(<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a>&nbsp;mealOfTheWeek)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/Restaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/Restaurant.html" target="_top">Frames</a></li>
+<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.User.User">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/User.html b/doc/User/User.html
index 3c0035e..f0c00fc 100644
--- a/doc/User/User.html
+++ b/doc/User/User.html
@@ -1,712 +1,717 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>User</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="User";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/User.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/User.html" target="_top">Frames</a></li>
-<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">User</div>
-<h2 title="Class User" class="title">Class User</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>User.User</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
-</dl>
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../User/HumanUser.html" title="class in User">HumanUser</a>, <a href="../User/MoralUser.html" title="class in User">MoralUser</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">User</span>
-extends java.lang.Object
-implements java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#COURIER">COURIER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User</a></span>(long&nbsp;phoneNumber,
-    java.lang.String&nbsp;name,
-    java.lang.String&nbsp;username,
-    java.lang.String&nbsp;mail,
-    java.lang.String&nbsp;password,
-    <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-    boolean&nbsp;activated)</code>
-<div class="block">CONSTRUCTOR</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#compareTo-User.User-">compareTo</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>
-<div class="block">OVERRIDE</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;other)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../Others/Adress.html" title="class in Others">Adress</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getAdress--">getAdress</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getId--">getId</a></span>()</code>
-<div class="block">GETTER & SETTER</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getMail--">getMail</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getName--">getName</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getUsername--">getUsername</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isActivated--">isActivated</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isLogged--">isLogged</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a></span>(java.lang.String&nbsp;username,
-              java.lang.String&nbsp;password)</code>&nbsp;</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code>static <a href="../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#login-Core.MyFoodora-">login</a></span>(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setActivated-boolean-">setActivated</a></span>(boolean&nbsp;activated)</code>&nbsp;</td>
-</tr>
-<tr id="i15" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setAdress-Others.Adress-">setAdress</a></span>(<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</code>&nbsp;</td>
-</tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setMail-java.lang.String-">setMail</a></span>(java.lang.String&nbsp;mail)</code>&nbsp;</td>
-</tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
-</tr>
-<tr id="i18" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setpassword-java.lang.String-">setpassword</a></span>(java.lang.String&nbsp;password)</code>&nbsp;</td>
-</tr>
-<tr id="i19" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a></span>(long&nbsp;phoneNumber)</code>&nbsp;</td>
-</tr>
-<tr id="i20" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a></span>(int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr id="i21" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></span>(java.lang.String&nbsp;username)</code>&nbsp;</td>
-</tr>
-<tr id="i22" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#toString--">toString</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="UNKNOWN">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UNKNOWN</h4>
-<pre>public static final&nbsp;int UNKNOWN</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.User.UNKNOWN">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="COURIER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>COURIER</h4>
-<pre>public static final&nbsp;int COURIER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.User.COURIER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="RESTAURANT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>RESTAURANT</h4>
-<pre>public static final&nbsp;int RESTAURANT</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.User.RESTAURANT">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CUSTOMER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CUSTOMER</h4>
-<pre>public static final&nbsp;int CUSTOMER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.User.CUSTOMER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MANAGER">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MANAGER</h4>
-<pre>public static final&nbsp;int MANAGER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#User.User.MANAGER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>User</h4>
-<pre>public&nbsp;User(long&nbsp;phoneNumber,
-            java.lang.String&nbsp;name,
-            java.lang.String&nbsp;username,
-            java.lang.String&nbsp;mail,
-            java.lang.String&nbsp;password,
-            <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-            boolean&nbsp;activated)</pre>
-<div class="block">CONSTRUCTOR</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="login-Core.MyFoodora-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>login</h4>
-<pre>public static&nbsp;<a href="../User/User.html" title="class in User">User</a>&nbsp;login(<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</pre>
-<div class="block">CUSTOM</div>
-</li>
-</ul>
-<a name="isLoginCorrect-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isLoginCorrect</h4>
-<pre>public&nbsp;boolean&nbsp;isLoginCorrect(java.lang.String&nbsp;username,
-                              java.lang.String&nbsp;password)</pre>
-</li>
-</ul>
-<a name="compareTo-User.User-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;compareTo(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
-<div class="block">OVERRIDE</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</code></dd>
-</dl>
-</li>
-</ul>
-<a name="equals-java.lang.Object-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;other)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="toString--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>toString</h4>
-<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
-</dl>
-</li>
-</ul>
-<a name="getId--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getId</h4>
-<pre>public&nbsp;long&nbsp;getId()</pre>
-<div class="block">GETTER & SETTER</div>
-</li>
-</ul>
-<a name="getTypeOfUser--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTypeOfUser</h4>
-<pre>public&nbsp;int&nbsp;getTypeOfUser()</pre>
-</li>
-</ul>
-<a name="setTypeOfUser-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTypeOfUser</h4>
-<pre>public&nbsp;void&nbsp;setTypeOfUser(int&nbsp;typeOfUser)</pre>
-</li>
-</ul>
-<a name="getHistoricOrder--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getHistoricOrder</h4>
-<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getHistoricOrder()</pre>
-</li>
-</ul>
-<a name="isLogged--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isLogged</h4>
-<pre>public&nbsp;boolean&nbsp;isLogged()</pre>
-</li>
-</ul>
-<a name="getPhoneNumber--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPhoneNumber</h4>
-<pre>public&nbsp;long&nbsp;getPhoneNumber()</pre>
-</li>
-</ul>
-<a name="setPhoneNumber-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPhoneNumber</h4>
-<pre>public&nbsp;void&nbsp;setPhoneNumber(long&nbsp;phoneNumber)</pre>
-</li>
-</ul>
-<a name="getName--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getName</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
-</li>
-</ul>
-<a name="setName-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setName</h4>
-<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;name)</pre>
-</li>
-</ul>
-<a name="getUsername--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getUsername</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getUsername()</pre>
-</li>
-</ul>
-<a name="setUsername-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setUsername</h4>
-<pre>public&nbsp;void&nbsp;setUsername(java.lang.String&nbsp;username)</pre>
-</li>
-</ul>
-<a name="getMail--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMail</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getMail()</pre>
-</li>
-</ul>
-<a name="setMail-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setMail</h4>
-<pre>public&nbsp;void&nbsp;setMail(java.lang.String&nbsp;mail)</pre>
-</li>
-</ul>
-<a name="setpassword-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setpassword</h4>
-<pre>public&nbsp;void&nbsp;setpassword(java.lang.String&nbsp;password)</pre>
-</li>
-</ul>
-<a name="getAdress--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getAdress</h4>
-<pre>public&nbsp;<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;getAdress()</pre>
-</li>
-</ul>
-<a name="setAdress-Others.Adress-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setAdress</h4>
-<pre>public&nbsp;void&nbsp;setAdress(<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</pre>
-</li>
-</ul>
-<a name="isActivated--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isActivated</h4>
-<pre>public&nbsp;boolean&nbsp;isActivated()</pre>
-</li>
-</ul>
-<a name="setActivated-boolean-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setActivated</h4>
-<pre>public&nbsp;void&nbsp;setActivated(boolean&nbsp;activated)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/User.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/User.html" target="_top">Frames</a></li>
-<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>User</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="User";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/User.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/UserFactory.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/User.html" target="_top">Frames</a></li>
+<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class User" class="title">Class User</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>User.User</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../User/HumanUser.html" title="class in User">HumanUser</a>, <a href="../User/MoralUser.html" title="class in User">MoralUser</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">User</span>
+extends java.lang.Object
+implements java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</pre>
+<div class="block">Abstraction of all the available users.
+ Each available user have a list of itself stocked in foodora.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/User.html#User--">User</a></span>()</code>
+<div class="block">CONSTRUCTOR</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User</a></span>(long&nbsp;phoneNumber,
+    java.lang.String&nbsp;name,
+    java.lang.String&nbsp;username,
+    java.lang.String&nbsp;mail,
+    java.lang.String&nbsp;password,
+    <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+    boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#compareTo-User.User-">compareTo</a></span>(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;other)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../Others/Adress.html" title="class in Others">Adress</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getAdress--">getAdress</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getHistoricOrder--">getHistoricOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getId--">getId</a></span>()</code>
+<div class="block">GETTER & SETTER</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getMail--">getMail</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getName--">getName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getPhoneNumber--">getPhoneNumber</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getTypeOfUser--">getTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#getUsername--">getUsername</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isActivated--">isActivated</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isLogged--">isLogged</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect</a></span>(java.lang.String&nbsp;username,
+              java.lang.String&nbsp;password)</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setActivated-boolean-">setActivated</a></span>(boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setAdress-Others.Adress-">setAdress</a></span>(<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</code>&nbsp;</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setMail-java.lang.String-">setMail</a></span>(java.lang.String&nbsp;mail)</code>&nbsp;</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setpassword-java.lang.String-">setpassword</a></span>(java.lang.String&nbsp;password)</code>&nbsp;</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber</a></span>(long&nbsp;phoneNumber)</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser</a></span>(int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#setUsername-java.lang.String-">setUsername</a></span>(java.lang.String&nbsp;username)</code>&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/User.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.User.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.User.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.User.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.User.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#User.User.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="User--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>User</h4>
+<pre>public&nbsp;User()</pre>
+<div class="block">CONSTRUCTOR</div>
+</li>
+</ul>
+<a name="User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>User</h4>
+<pre>public&nbsp;User(long&nbsp;phoneNumber,
+            java.lang.String&nbsp;name,
+            java.lang.String&nbsp;username,
+            java.lang.String&nbsp;mail,
+            java.lang.String&nbsp;password,
+            <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+            boolean&nbsp;activated)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="isLoginCorrect-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLoginCorrect</h4>
+<pre>public&nbsp;boolean&nbsp;isLoginCorrect(java.lang.String&nbsp;username,
+                              java.lang.String&nbsp;password)</pre>
+<div class="block">CUSTOM</div>
+</li>
+</ul>
+<a name="compareTo-User.User-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>compareTo</h4>
+<pre>public&nbsp;int&nbsp;compareTo(<a href="../User/User.html" title="class in User">User</a>&nbsp;u)</pre>
+<div class="block">OVERRIDE</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>compareTo</code>&nbsp;in interface&nbsp;<code>java.lang.Comparable&lt;<a href="../User/User.html" title="class in User">User</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;other)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getId--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getId</h4>
+<pre>public&nbsp;long&nbsp;getId()</pre>
+<div class="block">GETTER & SETTER</div>
+</li>
+</ul>
+<a name="getTypeOfUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTypeOfUser</h4>
+<pre>public&nbsp;int&nbsp;getTypeOfUser()</pre>
+</li>
+</ul>
+<a name="setTypeOfUser-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTypeOfUser</h4>
+<pre>public&nbsp;void&nbsp;setTypeOfUser(int&nbsp;typeOfUser)</pre>
+</li>
+</ul>
+<a name="getHistoricOrder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHistoricOrder</h4>
+<pre>public&nbsp;<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a>&nbsp;getHistoricOrder()</pre>
+</li>
+</ul>
+<a name="isLogged--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLogged</h4>
+<pre>public&nbsp;boolean&nbsp;isLogged()</pre>
+</li>
+</ul>
+<a name="getPhoneNumber--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPhoneNumber</h4>
+<pre>public&nbsp;long&nbsp;getPhoneNumber()</pre>
+</li>
+</ul>
+<a name="setPhoneNumber-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPhoneNumber</h4>
+<pre>public&nbsp;void&nbsp;setPhoneNumber(long&nbsp;phoneNumber)</pre>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+</li>
+</ul>
+<a name="setName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setName</h4>
+<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;name)</pre>
+</li>
+</ul>
+<a name="getUsername--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUsername</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getUsername()</pre>
+</li>
+</ul>
+<a name="setUsername-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUsername</h4>
+<pre>public&nbsp;void&nbsp;setUsername(java.lang.String&nbsp;username)</pre>
+</li>
+</ul>
+<a name="getMail--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMail</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getMail()</pre>
+</li>
+</ul>
+<a name="setMail-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMail</h4>
+<pre>public&nbsp;void&nbsp;setMail(java.lang.String&nbsp;mail)</pre>
+</li>
+</ul>
+<a name="setpassword-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setpassword</h4>
+<pre>public&nbsp;void&nbsp;setpassword(java.lang.String&nbsp;password)</pre>
+</li>
+</ul>
+<a name="getAdress--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAdress</h4>
+<pre>public&nbsp;<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;getAdress()</pre>
+</li>
+</ul>
+<a name="setAdress-Others.Adress-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setAdress</h4>
+<pre>public&nbsp;void&nbsp;setAdress(<a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress)</pre>
+</li>
+</ul>
+<a name="isActivated--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isActivated</h4>
+<pre>public&nbsp;boolean&nbsp;isActivated()</pre>
+</li>
+</ul>
+<a name="setActivated-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setActivated</h4>
+<pre>public&nbsp;void&nbsp;setActivated(boolean&nbsp;activated)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/User.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../User/UserFactory.html" title="class in User"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/User.html" target="_top">Frames</a></li>
+<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/UserFactory.html b/doc/User/UserFactory.html
new file mode 100644
index 0000000..93305d6
--- /dev/null
+++ b/doc/User/UserFactory.html
@@ -0,0 +1,283 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>UserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="UserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">User</div>
+<h2 title="Class UserFactory" class="title">Class UserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>User.UserFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">UserFactory</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../User/UserFactory.html#UserFactory--">UserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../User/UserFactory.html#createUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">createUser</a></span>(long&nbsp;phoneNumber,
+          java.lang.String&nbsp;name,
+          java.lang.String&nbsp;username,
+          java.lang.String&nbsp;mail,
+          java.lang.String&nbsp;password,
+          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+          boolean&nbsp;activated)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UserFactory</h4>
+<pre>public&nbsp;UserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createUser</h4>
+<pre>public abstract&nbsp;void&nbsp;createUser(long&nbsp;phoneNumber,
+                                java.lang.String&nbsp;name,
+                                java.lang.String&nbsp;username,
+                                java.lang.String&nbsp;mail,
+                                java.lang.String&nbsp;password,
+                                <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                boolean&nbsp;activated)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/User.html" title="class in User"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/Courier.html b/doc/User/class-use/Courier.html
index b4b0f63..699604e 100644
--- a/doc/User/class-use/Courier.html
+++ b/doc/User/class-use/Courier.html
@@ -1,220 +1,257 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.Courier</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.Courier";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Courier.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Courier.html" target="_top">Frames</a></li>
-<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.Courier" class="title">Uses of Class<br>User.Courier</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Courier.html" title="class in User">Courier</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addCourier-User.Courier-">addCourier</a></span>(<a href="../../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Courier.html" title="class in User">Courier</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with type arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">StrategyDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">FastestDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">FairOccupationDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier</a></span>(java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Courier.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Courier.html" target="_top">Frames</a></li>
-<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class User.Courier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.Courier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Courier.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Courier.html" target="_top">Frames</a></li>
+<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.Courier" class="title">Uses of Class<br>User.Courier</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Courier.html" title="class in User">Courier</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourierOrdered-java.lang.String-">getListCourierOrdered</a></span>(java.lang.String&nbsp;type)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addCourier-User.Courier-">addCourier</a></span>(<a href="../../User/Courier.html" title="class in User">Courier</a>&nbsp;c)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Courier.html" title="class in User">Courier</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> that return <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">StrategyDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FastestDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FairOccupationDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with type arguments of type <a href="../../User/Courier.html" title="class in User">Courier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">StrategyDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FastestDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FairOccupationDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Courier.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Courier.html" target="_top">Frames</a></li>
+<li><a href="Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/Customer.html b/doc/User/class-use/Customer.html
index ef02845..a366d14 100644
--- a/doc/User/class-use/Customer.html
+++ b/doc/User/class-use/Customer.html
@@ -1,190 +1,239 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.Customer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.Customer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Customer.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Customer.html" target="_top">Frames</a></li>
-<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.Customer" class="title">Uses of Class<br>User.Customer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Customer.html" title="class in User">Customer</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer</a></span>(<a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Customer.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Customer.html" target="_top">Frames</a></li>
-<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class User.Customer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.Customer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Customer.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Customer.html" target="_top">Frames</a></li>
+<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.Customer" class="title">Uses of Class<br>User.Customer</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Customer.html" title="class in User">Customer</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Customer.html" title="class in User">Customer</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getCustomerByOrder-Order.Order-">getCustomerByOrder</a></span>(<a href="../../Order/Order.html" title="class in Order">Order</a>&nbsp;o)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer</a></span>(<a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Customer.html" title="class in User">Customer</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with parameters of type <a href="../../User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">StrategyDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FastestDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FairOccupationDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Customer.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Customer.html" target="_top">Frames</a></li>
+<li><a href="Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/HumanUser.html b/doc/User/class-use/HumanUser.html
index ea32d19..48b80d8 100644
--- a/doc/User/class-use/HumanUser.html
+++ b/doc/User/class-use/HumanUser.html
@@ -1,229 +1,236 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.HumanUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.HumanUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/HumanUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/HumanUser.html" target="_top">Frames</a></li>
-<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.HumanUser" class="title">Uses of Class<br>User.HumanUser</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html" title="class in User">Courier</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html" title="class in User">Manager</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>abstract <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/HumanUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/HumanUser.html" target="_top">Frames</a></li>
-<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class User.HumanUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.HumanUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/HumanUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/HumanUser.html" target="_top">Frames</a></li>
+<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.HumanUser" class="title">Uses of Class<br>User.HumanUser</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html" title="class in User">Courier</a></span></code>
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html" title="class in User">Manager</a></span></code>
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/HumanUser.html" title="class in User">HumanUser</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/HumanUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/HumanUser.html" target="_top">Frames</a></li>
+<li><a href="HumanUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/IDUser.html b/doc/User/class-use/IDUser.html
index 14766e7..f97be82 100644
--- a/doc/User/class-use/IDUser.html
+++ b/doc/User/class-use/IDUser.html
@@ -1,164 +1,164 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.IDUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.IDUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/IDUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/IDUser.html" target="_top">Frames</a></li>
-<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.IDUser" class="title">Uses of Class<br>User.IDUser</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/IDUser.html" title="class in User">IDUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/IDUser.html" title="class in User">IDUser</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../User/IDUser.html" title="class in User">IDUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../User/IDUser.html" title="class in User">IDUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">IDUser.</span><code><span class="memberNameLink"><a href="../../User/IDUser.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/IDUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/IDUser.html" target="_top">Frames</a></li>
-<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class User.IDUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.IDUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/IDUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/IDUser.html" target="_top">Frames</a></li>
+<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.IDUser" class="title">Uses of Class<br>User.IDUser</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/IDUser.html" title="class in User">IDUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/IDUser.html" title="class in User">IDUser</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../User/IDUser.html" title="class in User">IDUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../User/IDUser.html" title="class in User">IDUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">IDUser.</span><code><span class="memberNameLink"><a href="../../User/IDUser.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/IDUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/IDUser.html" target="_top">Frames</a></li>
+<li><a href="IDUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/ListUser.html b/doc/User/class-use/ListUser.html
index 08c8da2..9cb9b89 100644
--- a/doc/User/class-use/ListUser.html
+++ b/doc/User/class-use/ListUser.html
@@ -1,209 +1,213 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.ListUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.ListUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/ListUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/ListUser.html" target="_top">Frames</a></li>
-<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.ListUser" class="title">Uses of Class<br>User.ListUser</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/ListUser.html" title="class in User">ListUser</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/ListUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/ListUser.html" target="_top">Frames</a></li>
-<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class User.ListUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.ListUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/ListUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/ListUser.html" target="_top">Frames</a></li>
+<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.ListUser" class="title">Uses of Class<br>User.ListUser</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/ListUser.html" title="class in User">ListUser</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourier--">getListCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCourierOrdered-java.lang.String-">getListCourierOrdered</a></span>(java.lang.String&nbsp;type)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListCustomer--">getListCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/ListUser.html" title="class in User">ListUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listCourier)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Customer.html" title="class in User">Customer</a>&gt;&nbsp;listCustomer)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/ListUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/ListUser.html" target="_top">Frames</a></li>
+<li><a href="ListUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/Manager.html b/doc/User/class-use/Manager.html
index 3becbd5..5b0caba 100644
--- a/doc/User/class-use/Manager.html
+++ b/doc/User/class-use/Manager.html
@@ -1,190 +1,190 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.Manager</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.Manager";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Manager.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Manager.html" target="_top">Frames</a></li>
-<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.Manager" class="title">Uses of Class<br>User.Manager</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Manager.html" title="class in User">Manager</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addManager-User.Manager-">addManager</a></span>(<a href="../../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Manager.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Manager.html" target="_top">Frames</a></li>
-<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class User.Manager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.Manager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Manager.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Manager.html" target="_top">Frames</a></li>
+<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.Manager" class="title">Uses of Class<br>User.Manager</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Manager.html" title="class in User">Manager</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListManager--">getListManager</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addManager-User.Manager-">addManager</a></span>(<a href="../../User/Manager.html" title="class in User">Manager</a>&nbsp;m)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Manager.html" title="class in User">Manager</a>&gt;&nbsp;listManager)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Manager.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Manager.html" target="_top">Frames</a></li>
+<li><a href="Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/MoralUser.html b/doc/User/class-use/MoralUser.html
index b7bb5ea..e8896a9 100644
--- a/doc/User/class-use/MoralUser.html
+++ b/doc/User/class-use/MoralUser.html
@@ -1,215 +1,218 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.MoralUser</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.MoralUser";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/MoralUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/MoralUser.html" target="_top">Frames</a></li>
-<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.MoralUser" class="title">Uses of Class<br>User.MoralUser</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>abstract <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/MoralUser.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/MoralUser.html" target="_top">Frames</a></li>
-<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class User.MoralUser</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.MoralUser";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/MoralUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/MoralUser.html" target="_top">Frames</a></li>
+<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.MoralUser" class="title">Uses of Class<br>User.MoralUser</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span></code>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/MoralUser.html" title="class in User">MoralUser</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MoralUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HumanUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/MoralUser.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/MoralUser.html" target="_top">Frames</a></li>
+<li><a href="MoralUser.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/Restaurant.html b/doc/User/class-use/Restaurant.html
index efcb123..33b6352 100644
--- a/doc/User/class-use/Restaurant.html
+++ b/doc/User/class-use/Restaurant.html
@@ -1,212 +1,345 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.Restaurant</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.Restaurant";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Restaurant.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Restaurant.html" target="_top">Frames</a></li>
-<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.Restaurant" class="title">Uses of Class<br>User.Restaurant</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-User.Restaurant-">placeOrder</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/Restaurant.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/Restaurant.html" target="_top">Frames</a></li>
-<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class User.Restaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.Restaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Restaurant.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Restaurant.html" target="_top">Frames</a></li>
+<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.Restaurant" class="title">Uses of Class<br>User.Restaurant</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getListRestaurant--">getListRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&gt;&nbsp;listRestaurant)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">StrategyDeliveryPolicy.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FastestDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;c,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Courier.html" title="class in User">Courier</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FairOccupationDelivery.</span><code><span class="memberNameLink"><a href="../../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+             <a href="../../User/Customer.html" title="class in User">Customer</a>&nbsp;customer,
+             java.util.ArrayList&lt;<a href="../../User/Courier.html" title="class in User">Courier</a>&gt;&nbsp;listOfCourier)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../Offers/package-summary.html">Offers</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Offers/package-summary.html">Offers</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ObservableOffer.</span><code><span class="memberNameLink"><a href="../../Offers/ObservableOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">BirthdayOffer.</span><code><span class="memberNameLink"><a href="../../Offers/BirthdayOffer.html#notifyObservers-User.Restaurant-">notifyObservers</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MealOfTheWeek.</span><code><span class="memberNameLink"><a href="../../Offers/MealOfTheWeek.html#setInterests-User.Restaurant-">setInterests</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;r)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../Order/package-summary.html">Order</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> that return <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/Restaurant.html" title="class in User">Restaurant</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#getRestaurantAttached--">getRestaurantAttached</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Order.</span><code><span class="memberNameLink"><a href="../../Order/Order.html#setRestaurantAttached-User.Restaurant-">setRestaurantAttached</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurantAttached)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../Order/package-summary.html">Order</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../Order/Order.html#Order-java.lang.String-User.Restaurant-">Order</a></span>(java.lang.String&nbsp;_name,
+     <a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;_restaurant)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/Restaurant.html" title="class in User">Restaurant</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#createOrder-java.lang.String-User.Restaurant-">createOrder</a></span>(java.lang.String&nbsp;name,
+           <a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/Dish.html" title="class in Item">Dish</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getSortedListOfDish-User.Restaurant-">getSortedListOfDish</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.util.ArrayList&lt;<a href="../../Item/HalfMeal.html" title="class in Item">HalfMeal</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#getSortedListOfHalfMeal-User.Restaurant-">getSortedListOfHalfMeal</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Customer.</span><code><span class="memberNameLink"><a href="../../User/Customer.html#placeOrder-User.Restaurant-java.lang.String-java.util.ArrayList-Core.MyFoodora-">placeOrder</a></span>(<a href="../../User/Restaurant.html" title="class in User">Restaurant</a>&nbsp;restaurant,
+          java.lang.String&nbsp;mealOrDish,
+          java.util.ArrayList&lt;java.lang.String&gt;&nbsp;listOfItem,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/Restaurant.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/Restaurant.html" target="_top">Frames</a></li>
+<li><a href="Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/User.html b/doc/User/class-use/User.html
index 886273a..bfb45f9 100644
--- a/doc/User/class-use/User.html
+++ b/doc/User/class-use/User.html
@@ -1,321 +1,344 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class User.User</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class User.User";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/User.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/User.html" target="_top">Frames</a></li>
-<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class User.User" class="title">Uses of Class<br>User.User</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../Core/package-summary.html">Core</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ActiveUserContext.</span><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#getUser--">getUser</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;usernameTest,
-              java.lang.String&nbsp;passwordTest)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addUser-User.User-">addUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">ActiveUserContext.</span><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../User/package-summary.html">User</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../User/package-summary.html">User</a> with type parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;T extends <a href="../../User/User.html" title="class in User">User</a>&gt;</span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html" title="class in User">Courier</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html" title="class in User">Manager</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><span class="typeNameLabel">ListUser.</span><code><span class="memberNameLink"><a href="../../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;username,
-              java.lang.String&nbsp;password)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../User/User.html" title="class in User">User</a></code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#login-Core.MyFoodora-">login</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>
-<div class="block">CUSTOM</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-            <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#compareTo-User.User-">compareTo</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>
-<div class="block">OVERRIDE</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
-               <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u,
-          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../User/User.html" title="class in User">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?User/class-use/User.html" target="_top">Frames</a></li>
-<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class User.User</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.User";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/User.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/User.html" target="_top">Frames</a></li>
+<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.User" class="title">Uses of Class<br>User.User</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../Core/package-summary.html">Core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ActiveUserContext.</span><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#getUser--">getUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;usernameTest,
+              java.lang.String&nbsp;passwordTest)</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getUserByName-java.lang.String-java.lang.String-">getUserByName</a></span>(java.lang.String&nbsp;username,
+             java.lang.String&nbsp;name)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getUserByUsername-java.lang.String-">getUserByUsername</a></span>(java.lang.String&nbsp;username)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> that return types with arguments of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser</a></span>()</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../Core/package-summary.html">Core</a> with parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#addUser-User.User-">addUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">ActiveUserContext.</span><code><span class="memberNameLink"><a href="../../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../Core/package-summary.html">Core</a> with type arguments of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MyFoodora.</span><code><span class="memberNameLink"><a href="../../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser</a></span>(<a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;<a href="../../User/User.html" title="class in User">User</a>&gt;&nbsp;globalListUser)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../User/package-summary.html">User</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../User/package-summary.html">User</a> with type parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/ListUser.html" title="class in User">ListUser</a>&lt;T extends <a href="../../User/User.html" title="class in User">User</a>&gt;</span></code>
+<div class="block">Gives methods and form to use and manage list of users.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../User/User.html" title="class in User">User</a> in <a href="../../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Courier.html" title="class in User">Courier</a></span></code>
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Customer.html" title="class in User">Customer</a></span></code>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/HumanUser.html" title="class in User">HumanUser</a></span></code>
+<div class="block">Abstraction of human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Manager.html" title="class in User">Manager</a></span></code>
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/MoralUser.html" title="class in User">MoralUser</a></span></code>
+<div class="block">Abstraction of non human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../User/Restaurant.html" title="class in User">Restaurant</a></span></code>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> that return <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../User/User.html" title="class in User">User</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ListUser.</span><code><span class="memberNameLink"><a href="../../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin</a></span>(java.lang.String&nbsp;username,
+              java.lang.String&nbsp;password)</code>
+<div class="block">CUSTOM</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../User/package-summary.html">User</a> with parameters of type <a href="../../User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+            <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span class="typeNameLabel">User.</span><code><span class="memberNameLink"><a href="../../User/User.html#compareTo-User.User-">compareTo</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u)</code>
+<div class="block">OVERRIDE</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><span class="typeNameLabel">Courier.</span><code><span class="memberNameLink"><a href="../../User/Courier.html#compareTo-User.User-">compareTo</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;courier)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser</a></span>(<a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora,
+               <a href="../../User/User.html" title="class in User">User</a>&nbsp;user)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Manager.</span><code><span class="memberNameLink"><a href="../../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser</a></span>(<a href="../../User/User.html" title="class in User">User</a>&nbsp;u,
+          <a href="../../Core/MyFoodora.html" title="class in Core">MyFoodora</a>&nbsp;foodora)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/User.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/User.html" target="_top">Frames</a></li>
+<li><a href="User.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/class-use/UserFactory.html b/doc/User/class-use/UserFactory.html
new file mode 100644
index 0000000..e131bbc
--- /dev/null
+++ b/doc/User/class-use/UserFactory.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:36 CEST 2017 -->
+<title>Uses of Class User.UserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class User.UserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/UserFactory.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class User.UserFactory" class="title">Uses of Class<br>User.UserFactory</h2>
+</div>
+<div class="classUseContainer">No usage of User.UserFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../User/UserFactory.html" title="class in User">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?User/class-use/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/package-frame.html b/doc/User/package-frame.html
index 828b7ca..b631273 100644
--- a/doc/User/package-frame.html
+++ b/doc/User/package-frame.html
@@ -1,28 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>User</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../User/package-summary.html" target="classFrame">User</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="Courier.html" title="class in User" target="classFrame">Courier</a></li>
-<li><a href="Customer.html" title="class in User" target="classFrame">Customer</a></li>
-<li><a href="HumanUser.html" title="class in User" target="classFrame">HumanUser</a></li>
-<li><a href="IDUser.html" title="class in User" target="classFrame">IDUser</a></li>
-<li><a href="ListUser.html" title="class in User" target="classFrame">ListUser</a></li>
-<li><a href="Manager.html" title="class in User" target="classFrame">Manager</a></li>
-<li><a href="MoralUser.html" title="class in User" target="classFrame">MoralUser</a></li>
-<li><a href="Restaurant.html" title="class in User" target="classFrame">Restaurant</a></li>
-<li><a href="User.html" title="class in User" target="classFrame">User</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>User</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../User/package-summary.html" target="classFrame">User</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="Courier.html" title="class in User" target="classFrame">Courier</a></li>
+<li><a href="Customer.html" title="class in User" target="classFrame">Customer</a></li>
+<li><a href="HumanUser.html" title="class in User" target="classFrame">HumanUser</a></li>
+<li><a href="IDUser.html" title="class in User" target="classFrame">IDUser</a></li>
+<li><a href="ListUser.html" title="class in User" target="classFrame">ListUser</a></li>
+<li><a href="Manager.html" title="class in User" target="classFrame">Manager</a></li>
+<li><a href="MoralUser.html" title="class in User" target="classFrame">MoralUser</a></li>
+<li><a href="Restaurant.html" title="class in User" target="classFrame">Restaurant</a></li>
+<li><a href="User.html" title="class in User" target="classFrame">User</a></li>
+<li><a href="UserFactory.html" title="class in User" target="classFrame">UserFactory</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/User/package-summary.html b/doc/User/package-summary.html
index e8bf52b..c1da264 100644
--- a/doc/User/package-summary.html
+++ b/doc/User/package-summary.html
@@ -1,174 +1,198 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>User</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="User";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../test/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../UserFactoryPattern/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;User</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../User/Courier.html" title="class in User">Courier</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../User/Customer.html" title="class in User">Customer</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../User/HumanUser.html" title="class in User">HumanUser</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../User/IDUser.html" title="class in User">IDUser</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../User/Manager.html" title="class in User">Manager</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../User/MoralUser.html" title="class in User">MoralUser</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../User/Restaurant.html" title="class in User">Restaurant</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../User/User.html" title="class in User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../test/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../UserFactoryPattern/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>User</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="User";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../UserFactoryPattern/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;User</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../User/Courier.html" title="class in User">Courier</a></td>
+<td class="colLast">
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../User/Customer.html" title="class in User">Customer</a></td>
+<td class="colLast">
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../User/HumanUser.html" title="class in User">HumanUser</a></td>
+<td class="colLast">
+<div class="block">Abstraction of human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../User/IDUser.html" title="class in User">IDUser</a></td>
+<td class="colLast">
+<div class="block">Attache an unique Id to the user.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../User/ListUser.html" title="class in User">ListUser</a>&lt;T extends <a href="../User/User.html" title="class in User">User</a>&gt;</td>
+<td class="colLast">
+<div class="block">Gives methods and form to use and manage list of users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../User/Manager.html" title="class in User">Manager</a></td>
+<td class="colLast">
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../User/MoralUser.html" title="class in User">MoralUser</a></td>
+<td class="colLast">
+<div class="block">Abstraction of non human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../User/Restaurant.html" title="class in User">Restaurant</a></td>
+<td class="colLast">
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../User/User.html" title="class in User">User</a></td>
+<td class="colLast">
+<div class="block">Abstraction of all the available users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../User/UserFactory.html" title="class in User">UserFactory</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../UserFactoryPattern/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/package-tree.html b/doc/User/package-tree.html
index 83163f4..2c92d54 100644
--- a/doc/User/package-tree.html
+++ b/doc/User/package-tree.html
@@ -1,154 +1,155 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>User Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="User Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../test/package-tree.html">Prev</a></li>
-<li><a href="../UserFactoryPattern/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package User</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">User.<a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a></li>
-<li type="circle">User.<a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;T&gt; (implements java.lang.Iterable&lt;T&gt;)</li>
-<li type="circle">User.<a href="../User/User.html" title="class in User"><span class="typeNameLink">User</span></a> (implements java.lang.Comparable&lt;T&gt;)
-<ul>
-<li type="circle">User.<a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a>
-<ul>
-<li type="circle">User.<a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a></li>
-<li type="circle">User.<a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> (implements Offers.<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>, Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>)</li>
-<li type="circle">User.<a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a></li>
-</ul>
-</li>
-<li type="circle">User.<a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a>
-<ul>
-<li type="circle">User.<a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../test/package-tree.html">Prev</a></li>
-<li><a href="../UserFactoryPattern/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>User Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="User Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/package-tree.html">Prev</a></li>
+<li><a href="../UserFactoryPattern/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package User</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">User.<a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a></li>
+<li type="circle">User.<a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;T&gt; (implements java.lang.Iterable&lt;T&gt;)</li>
+<li type="circle">User.<a href="../User/User.html" title="class in User"><span class="typeNameLink">User</span></a> (implements java.lang.Comparable&lt;T&gt;)
+<ul>
+<li type="circle">User.<a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a>
+<ul>
+<li type="circle">User.<a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a></li>
+<li type="circle">User.<a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> (implements Offers.<a href="../Offers/Observer.html" title="interface in Offers">Observer</a>, Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>)</li>
+<li type="circle">User.<a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a></li>
+</ul>
+</li>
+<li type="circle">User.<a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a>
+<ul>
+<li type="circle">User.<a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">User.<a href="../User/UserFactory.html" title="class in User"><span class="typeNameLink">UserFactory</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/package-tree.html">Prev</a></li>
+<li><a href="../UserFactoryPattern/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/User/package-use.html b/doc/User/package-use.html
index c502b31..b8123ad 100644
--- a/doc/User/package-use.html
+++ b/doc/User/package-use.html
@@ -1,244 +1,330 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package User</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package User";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package User" class="title">Uses of Package<br>User</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#Core">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="#User">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="Core">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/Courier.html#Core">Courier</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/Customer.html#Core">Customer</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/ListUser.html#Core">ListUser</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/Manager.html#Core">Manager</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/Restaurant.html#Core">Restaurant</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/User.html#Core">User</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="DeliveryStrategy">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/Courier.html#DeliveryStrategy">Courier</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="User">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/HumanUser.html#User">HumanUser</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/IDUser.html#User">IDUser</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/MoralUser.html#User">MoralUser</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/Restaurant.html#User">Restaurant</a>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/User.html#User">User</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../User/class-use/HumanUser.html#UserFactoryPattern">HumanUser</a>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../User/class-use/MoralUser.html#UserFactoryPattern">MoralUser</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?User/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package User</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package User";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package User" class="title">Uses of Package<br>User</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#Core">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#DeliveryStrategy">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#Offers">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#Order">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="#User">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Core">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../Core/package-summary.html">Core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Courier.html#Core">Courier</a>
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/Customer.html#Core">Customer</a>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/ListUser.html#Core">ListUser</a>
+<div class="block">Gives methods and form to use and manage list of users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/Manager.html#Core">Manager</a>
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Restaurant.html#Core">Restaurant</a>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/User.html#Core">User</a>
+<div class="block">Abstraction of all the available users.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="DeliveryStrategy">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Courier.html#DeliveryStrategy">Courier</a>
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/Customer.html#DeliveryStrategy">Customer</a>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Restaurant.html#DeliveryStrategy">Restaurant</a>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Offers">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../Offers/package-summary.html">Offers</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Restaurant.html#Offers">Restaurant</a>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="Order">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../Order/package-summary.html">Order</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/Restaurant.html#Order">Restaurant</a>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="User">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../User/package-summary.html">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/HumanUser.html#User">HumanUser</a>
+<div class="block">Abstraction of human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/IDUser.html#User">IDUser</a>
+<div class="block">Attache an unique Id to the user.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/MoralUser.html#User">MoralUser</a>
+<div class="block">Abstraction of non human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/Restaurant.html#User">Restaurant</a>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/User.html#User">User</a>
+<div class="block">Abstraction of all the available users.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../User/package-summary.html">User</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../User/class-use/HumanUser.html#UserFactoryPattern">HumanUser</a>
+<div class="block">Abstraction of human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../User/class-use/MoralUser.html#UserFactoryPattern">MoralUser</a>
+<div class="block">Abstraction of non human users.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?User/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/FactoryUserFactory.html b/doc/UserFactoryPattern/FactoryUserFactory.html
index 7f6a48b..1dec8cb 100644
--- a/doc/UserFactoryPattern/FactoryUserFactory.html
+++ b/doc/UserFactoryPattern/FactoryUserFactory.html
@@ -1,271 +1,281 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>FactoryUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FactoryUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/FactoryUserFactory.html" target="_top">Frames</a></li>
-<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">UserFactoryPattern</div>
-<h2 title="Class FactoryUserFactory" class="title">Class FactoryUserFactory</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>UserFactoryPattern.FactoryUserFactory</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">FactoryUserFactory</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#FactoryUserFactory--">FactoryUserFactory</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory</a></span>(java.lang.String&nbsp;typeOfUserFactory)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FactoryUserFactory--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FactoryUserFactory</h4>
-<pre>public&nbsp;FactoryUserFactory()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createUserFactory-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createUserFactory</h4>
-<pre>public static&nbsp;<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a>&nbsp;createUserFactory(java.lang.String&nbsp;typeOfUserFactory)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/FactoryUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/FactoryUserFactory.html" target="_top">Frames</a></li>
-<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>FactoryUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="FactoryUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/FactoryUserFactory.html" target="_top">Frames</a></li>
+<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">UserFactoryPattern</div>
+<h2 title="Class FactoryUserFactory" class="title">Class FactoryUserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>UserFactoryPattern.FactoryUserFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">FactoryUserFactory</span>
+extends java.lang.Object</pre>
+<div class="block">Context to use user factories.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#FactoryUserFactory--">FactoryUserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory</a></span>(java.lang.String&nbsp;typeOfUserFactory)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="FactoryUserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FactoryUserFactory</h4>
+<pre>public&nbsp;FactoryUserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createUserFactory-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createUserFactory</h4>
+<pre>public static&nbsp;<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a>&nbsp;createUserFactory(java.lang.String&nbsp;typeOfUserFactory)
+                                     throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FactoryUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/FactoryUserFactory.html" target="_top">Frames</a></li>
+<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/HumanUserFactory.html b/doc/UserFactoryPattern/HumanUserFactory.html
index b1ea246..dd0c774 100644
--- a/doc/UserFactoryPattern/HumanUserFactory.html
+++ b/doc/UserFactoryPattern/HumanUserFactory.html
@@ -1,344 +1,352 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>HumanUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="HumanUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HumanUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/HumanUserFactory.html" target="_top">Frames</a></li>
-<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">UserFactoryPattern</div>
-<h2 title="Class HumanUserFactory" class="title">Class HumanUserFactory</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactoryPattern.UserFactory</a></li>
-<li>
-<ul class="inheritance">
-<li>UserFactoryPattern.HumanUserFactory</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">HumanUserFactory</span>
-extends <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.UserFactoryPattern.UserFactory">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></h3>
-<code><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a>, <a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a>, <a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a>, <a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a>, <a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#HumanUserFactory--">HumanUserFactory</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="HumanUserFactory--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>HumanUserFactory</h4>
-<pre>public&nbsp;HumanUserFactory()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>createHumanUser</h4>
-<pre>public&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
-                                 java.lang.String&nbsp;name,
-                                 java.lang.String&nbsp;username,
-                                 java.lang.String&nbsp;mail,
-                                 java.lang.String&nbsp;password,
-                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                 boolean&nbsp;activated,
-                                 java.lang.String&nbsp;birthdayDate,
-                                 java.lang.String&nbsp;surname,
-                                 int&nbsp;typeOfUser)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createMoralUser</h4>
-<pre>public&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
-                                 java.lang.String&nbsp;name,
-                                 java.lang.String&nbsp;username,
-                                 java.lang.String&nbsp;mail,
-                                 java.lang.String&nbsp;password,
-                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                 boolean&nbsp;activated,
-                                 int&nbsp;typeOfUser)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/HumanUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/HumanUserFactory.html" target="_top">Frames</a></li>
-<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>HumanUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="HumanUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HumanUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/HumanUserFactory.html" target="_top">Frames</a></li>
+<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">UserFactoryPattern</div>
+<h2 title="Class HumanUserFactory" class="title">Class HumanUserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactoryPattern.UserFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>UserFactoryPattern.HumanUserFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">HumanUserFactory</span>
+extends <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></pre>
+<div class="block">Allow to create human users.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.UserFactoryPattern.UserFactory">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></h3>
+<code><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a>, <a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a>, <a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a>, <a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a>, <a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#HumanUserFactory--">HumanUserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="HumanUserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HumanUserFactory</h4>
+<pre>public&nbsp;HumanUserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createHumanUser</h4>
+<pre>public&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
+                                 java.lang.String&nbsp;name,
+                                 java.lang.String&nbsp;username,
+                                 java.lang.String&nbsp;mail,
+                                 java.lang.String&nbsp;password,
+                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                 boolean&nbsp;activated,
+                                 java.lang.String&nbsp;birthdayDate,
+                                 java.lang.String&nbsp;surname,
+                                 int&nbsp;typeOfUser)
+                          throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createMoralUser</h4>
+<pre>public&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
+                                 java.lang.String&nbsp;name,
+                                 java.lang.String&nbsp;username,
+                                 java.lang.String&nbsp;mail,
+                                 java.lang.String&nbsp;password,
+                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                 boolean&nbsp;activated,
+                                 int&nbsp;typeOfUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HumanUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/HumanUserFactory.html" target="_top">Frames</a></li>
+<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/MoralUserFactory.html b/doc/UserFactoryPattern/MoralUserFactory.html
index e7e4e1f..3762d5f 100644
--- a/doc/UserFactoryPattern/MoralUserFactory.html
+++ b/doc/UserFactoryPattern/MoralUserFactory.html
@@ -1,344 +1,352 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>MoralUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MoralUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MoralUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/MoralUserFactory.html" target="_top">Frames</a></li>
-<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">UserFactoryPattern</div>
-<h2 title="Class MoralUserFactory" class="title">Class MoralUserFactory</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactoryPattern.UserFactory</a></li>
-<li>
-<ul class="inheritance">
-<li>UserFactoryPattern.MoralUserFactory</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MoralUserFactory</span>
-extends <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.UserFactoryPattern.UserFactory">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></h3>
-<code><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a>, <a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a>, <a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a>, <a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a>, <a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#MoralUserFactory--">MoralUserFactory</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MoralUserFactory--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MoralUserFactory</h4>
-<pre>public&nbsp;MoralUserFactory()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>createHumanUser</h4>
-<pre>public&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
-                                 java.lang.String&nbsp;name,
-                                 java.lang.String&nbsp;username,
-                                 java.lang.String&nbsp;mail,
-                                 java.lang.String&nbsp;password,
-                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                 boolean&nbsp;activated,
-                                 java.lang.String&nbsp;birthdayDate,
-                                 java.lang.String&nbsp;surname,
-                                 int&nbsp;typeOfUser)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createMoralUser</h4>
-<pre>public&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
-                                 java.lang.String&nbsp;name,
-                                 java.lang.String&nbsp;username,
-                                 java.lang.String&nbsp;mail,
-                                 java.lang.String&nbsp;password,
-                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                 boolean&nbsp;activated,
-                                 int&nbsp;typeOfUser)</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/MoralUserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/MoralUserFactory.html" target="_top">Frames</a></li>
-<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>MoralUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="MoralUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MoralUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/MoralUserFactory.html" target="_top">Frames</a></li>
+<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">UserFactoryPattern</div>
+<h2 title="Class MoralUserFactory" class="title">Class MoralUserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactoryPattern.UserFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>UserFactoryPattern.MoralUserFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MoralUserFactory</span>
+extends <a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></pre>
+<div class="block">Allow to create generic non human users.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.UserFactoryPattern.UserFactory">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></h3>
+<code><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a>, <a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a>, <a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a>, <a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a>, <a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#MoralUserFactory--">MoralUserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MoralUserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MoralUserFactory</h4>
+<pre>public&nbsp;MoralUserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createHumanUser</h4>
+<pre>public&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
+                                 java.lang.String&nbsp;name,
+                                 java.lang.String&nbsp;username,
+                                 java.lang.String&nbsp;mail,
+                                 java.lang.String&nbsp;password,
+                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                 boolean&nbsp;activated,
+                                 java.lang.String&nbsp;birthdayDate,
+                                 java.lang.String&nbsp;surname,
+                                 int&nbsp;typeOfUser)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createMoralUser</h4>
+<pre>public&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
+                                 java.lang.String&nbsp;name,
+                                 java.lang.String&nbsp;username,
+                                 java.lang.String&nbsp;mail,
+                                 java.lang.String&nbsp;password,
+                                 <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                 boolean&nbsp;activated,
+                                 int&nbsp;typeOfUser)
+                          throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></code>&nbsp;in class&nbsp;<code><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MoralUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/MoralUserFactory.html" target="_top">Frames</a></li>
+<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.UserFactoryPattern.UserFactory">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/UserFactory.html b/doc/UserFactoryPattern/UserFactory.html
index 2ff3de5..cc43326 100644
--- a/doc/UserFactoryPattern/UserFactory.html
+++ b/doc/UserFactoryPattern/UserFactory.html
@@ -1,428 +1,443 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>UserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/UserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/UserFactory.html" target="_top">Frames</a></li>
-<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">UserFactoryPattern</div>
-<h2 title="Class UserFactory" class="title">Class UserFactory</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>UserFactoryPattern.UserFactory</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a>, <a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">UserFactory</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UserFactory--">UserFactory</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>abstract <a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               java.lang.String&nbsp;birthdayDate,
-               java.lang.String&nbsp;surname,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>abstract <a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
-               java.lang.String&nbsp;name,
-               java.lang.String&nbsp;username,
-               java.lang.String&nbsp;mail,
-               java.lang.String&nbsp;password,
-               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-               boolean&nbsp;activated,
-               int&nbsp;typeOfUser)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="UNKNOWN">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UNKNOWN</h4>
-<pre>public static final&nbsp;int UNKNOWN</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.UNKNOWN">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="COURIER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>COURIER</h4>
-<pre>public static final&nbsp;int COURIER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.COURIER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="RESTAURANT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>RESTAURANT</h4>
-<pre>public static final&nbsp;int RESTAURANT</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.RESTAURANT">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CUSTOMER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CUSTOMER</h4>
-<pre>public static final&nbsp;int CUSTOMER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.CUSTOMER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MANAGER">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MANAGER</h4>
-<pre>public static final&nbsp;int MANAGER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.MANAGER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="UserFactory--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>UserFactory</h4>
-<pre>public&nbsp;UserFactory()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>createHumanUser</h4>
-<pre>public abstract&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
-                                          java.lang.String&nbsp;name,
-                                          java.lang.String&nbsp;username,
-                                          java.lang.String&nbsp;mail,
-                                          java.lang.String&nbsp;password,
-                                          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                          boolean&nbsp;activated,
-                                          java.lang.String&nbsp;birthdayDate,
-                                          java.lang.String&nbsp;surname,
-                                          int&nbsp;typeOfUser)</pre>
-</li>
-</ul>
-<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>createMoralUser</h4>
-<pre>public abstract&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
-                                          java.lang.String&nbsp;name,
-                                          java.lang.String&nbsp;username,
-                                          java.lang.String&nbsp;mail,
-                                          java.lang.String&nbsp;password,
-                                          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
-                                          boolean&nbsp;activated,
-                                          int&nbsp;typeOfUser)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/UserFactory.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/UserFactory.html" target="_top">Frames</a></li>
-<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:29 CEST 2017 -->
+<title>UserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="UserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">UserFactoryPattern</div>
+<h2 title="Class UserFactory" class="title">Class UserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>UserFactoryPattern.UserFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a>, <a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">UserFactory</span>
+extends java.lang.Object</pre>
+<div class="block">Factory to create factory of abstracted user.</div>
+<dl>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Nicolas FLEY et Corentin RAVOUX</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UserFactory--">UserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract <a href="../User/HumanUser.html" title="class in User">HumanUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               java.lang.String&nbsp;birthdayDate,
+               java.lang.String&nbsp;surname,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="../User/MoralUser.html" title="class in User">MoralUser</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser</a></span>(long&nbsp;phoneNumber,
+               java.lang.String&nbsp;name,
+               java.lang.String&nbsp;username,
+               java.lang.String&nbsp;mail,
+               java.lang.String&nbsp;password,
+               <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+               boolean&nbsp;activated,
+               int&nbsp;typeOfUser)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#UserFactoryPattern.UserFactory.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UserFactory</h4>
+<pre>public&nbsp;UserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createHumanUser</h4>
+<pre>public abstract&nbsp;<a href="../User/HumanUser.html" title="class in User">HumanUser</a>&nbsp;createHumanUser(long&nbsp;phoneNumber,
+                                          java.lang.String&nbsp;name,
+                                          java.lang.String&nbsp;username,
+                                          java.lang.String&nbsp;mail,
+                                          java.lang.String&nbsp;password,
+                                          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                          boolean&nbsp;activated,
+                                          java.lang.String&nbsp;birthdayDate,
+                                          java.lang.String&nbsp;surname,
+                                          int&nbsp;typeOfUser)
+                                   throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createMoralUser</h4>
+<pre>public abstract&nbsp;<a href="../User/MoralUser.html" title="class in User">MoralUser</a>&nbsp;createMoralUser(long&nbsp;phoneNumber,
+                                          java.lang.String&nbsp;name,
+                                          java.lang.String&nbsp;username,
+                                          java.lang.String&nbsp;mail,
+                                          java.lang.String&nbsp;password,
+                                          <a href="../Others/Adress.html" title="class in Others">Adress</a>&nbsp;adress,
+                                          boolean&nbsp;activated,
+                                          int&nbsp;typeOfUser)
+                                   throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/class-use/FactoryUserFactory.html b/doc/UserFactoryPattern/class-use/FactoryUserFactory.html
index 3f84d90..fefed1e 100644
--- a/doc/UserFactoryPattern/class-use/FactoryUserFactory.html
+++ b/doc/UserFactoryPattern/class-use/FactoryUserFactory.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class UserFactoryPattern.FactoryUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class UserFactoryPattern.FactoryUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/FactoryUserFactory.html" target="_top">Frames</a></li>
-<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class UserFactoryPattern.FactoryUserFactory" class="title">Uses of Class<br>UserFactoryPattern.FactoryUserFactory</h2>
-</div>
-<div class="classUseContainer">No usage of UserFactoryPattern.FactoryUserFactory</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/FactoryUserFactory.html" target="_top">Frames</a></li>
-<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class UserFactoryPattern.FactoryUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class UserFactoryPattern.FactoryUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/FactoryUserFactory.html" target="_top">Frames</a></li>
+<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class UserFactoryPattern.FactoryUserFactory" class="title">Uses of Class<br>UserFactoryPattern.FactoryUserFactory</h2>
+</div>
+<div class="classUseContainer">No usage of UserFactoryPattern.FactoryUserFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/FactoryUserFactory.html" target="_top">Frames</a></li>
+<li><a href="FactoryUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/class-use/HumanUserFactory.html b/doc/UserFactoryPattern/class-use/HumanUserFactory.html
index ddbdbf8..ed4d809 100644
--- a/doc/UserFactoryPattern/class-use/HumanUserFactory.html
+++ b/doc/UserFactoryPattern/class-use/HumanUserFactory.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class UserFactoryPattern.HumanUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class UserFactoryPattern.HumanUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/HumanUserFactory.html" target="_top">Frames</a></li>
-<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class UserFactoryPattern.HumanUserFactory" class="title">Uses of Class<br>UserFactoryPattern.HumanUserFactory</h2>
-</div>
-<div class="classUseContainer">No usage of UserFactoryPattern.HumanUserFactory</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/HumanUserFactory.html" target="_top">Frames</a></li>
-<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class UserFactoryPattern.HumanUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class UserFactoryPattern.HumanUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/HumanUserFactory.html" target="_top">Frames</a></li>
+<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class UserFactoryPattern.HumanUserFactory" class="title">Uses of Class<br>UserFactoryPattern.HumanUserFactory</h2>
+</div>
+<div class="classUseContainer">No usage of UserFactoryPattern.HumanUserFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/HumanUserFactory.html" target="_top">Frames</a></li>
+<li><a href="HumanUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/class-use/MoralUserFactory.html b/doc/UserFactoryPattern/class-use/MoralUserFactory.html
index c0d1a68..d436d6b 100644
--- a/doc/UserFactoryPattern/class-use/MoralUserFactory.html
+++ b/doc/UserFactoryPattern/class-use/MoralUserFactory.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class UserFactoryPattern.MoralUserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class UserFactoryPattern.MoralUserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/MoralUserFactory.html" target="_top">Frames</a></li>
-<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class UserFactoryPattern.MoralUserFactory" class="title">Uses of Class<br>UserFactoryPattern.MoralUserFactory</h2>
-</div>
-<div class="classUseContainer">No usage of UserFactoryPattern.MoralUserFactory</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/MoralUserFactory.html" target="_top">Frames</a></li>
-<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class UserFactoryPattern.MoralUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class UserFactoryPattern.MoralUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/MoralUserFactory.html" target="_top">Frames</a></li>
+<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class UserFactoryPattern.MoralUserFactory" class="title">Uses of Class<br>UserFactoryPattern.MoralUserFactory</h2>
+</div>
+<div class="classUseContainer">No usage of UserFactoryPattern.MoralUserFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/MoralUserFactory.html" target="_top">Frames</a></li>
+<li><a href="MoralUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/class-use/UserFactory.html b/doc/UserFactoryPattern/class-use/UserFactory.html
index 49c4ccb..04f9fe9 100644
--- a/doc/UserFactoryPattern/class-use/UserFactory.html
+++ b/doc/UserFactoryPattern/class-use/UserFactory.html
@@ -1,181 +1,185 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class UserFactoryPattern.UserFactory</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class UserFactoryPattern.UserFactory";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/UserFactory.html" target="_top">Frames</a></li>
-<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class UserFactoryPattern.UserFactory" class="title">Uses of Class<br>UserFactoryPattern.UserFactory</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></td>
-<td class="colLast"><span class="typeNameLabel">FactoryUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory</a></span>(java.lang.String&nbsp;typeOfUserFactory)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?UserFactoryPattern/class-use/UserFactory.html" target="_top">Frames</a></li>
-<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:35 CEST 2017 -->
+<title>Uses of Class UserFactoryPattern.UserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class UserFactoryPattern.UserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class UserFactoryPattern.UserFactory" class="title">Uses of Class<br>UserFactoryPattern.UserFactory</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a> in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></span></code>
+<div class="block">Allow to create human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></span></code>
+<div class="block">Allow to create generic non human users.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> that return <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FactoryUserFactory.</span><code><span class="memberNameLink"><a href="../../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory</a></span>(java.lang.String&nbsp;typeOfUserFactory)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?UserFactoryPattern/class-use/UserFactory.html" target="_top">Frames</a></li>
+<li><a href="UserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/package-frame.html b/doc/UserFactoryPattern/package-frame.html
index c049c79..0da14c1 100644
--- a/doc/UserFactoryPattern/package-frame.html
+++ b/doc/UserFactoryPattern/package-frame.html
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>UserFactoryPattern</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../UserFactoryPattern/package-summary.html" target="classFrame">UserFactoryPattern</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="FactoryUserFactory.html" title="class in UserFactoryPattern" target="classFrame">FactoryUserFactory</a></li>
-<li><a href="HumanUserFactory.html" title="class in UserFactoryPattern" target="classFrame">HumanUserFactory</a></li>
-<li><a href="MoralUserFactory.html" title="class in UserFactoryPattern" target="classFrame">MoralUserFactory</a></li>
-<li><a href="UserFactory.html" title="class in UserFactoryPattern" target="classFrame">UserFactory</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>UserFactoryPattern</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../UserFactoryPattern/package-summary.html" target="classFrame">UserFactoryPattern</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="FactoryUserFactory.html" title="class in UserFactoryPattern" target="classFrame">FactoryUserFactory</a></li>
+<li><a href="HumanUserFactory.html" title="class in UserFactoryPattern" target="classFrame">HumanUserFactory</a></li>
+<li><a href="MoralUserFactory.html" title="class in UserFactoryPattern" target="classFrame">MoralUserFactory</a></li>
+<li><a href="UserFactory.html" title="class in UserFactoryPattern" target="classFrame">UserFactory</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/package-summary.html b/doc/UserFactoryPattern/package-summary.html
index 4a1a094..e6183e6 100644
--- a/doc/UserFactoryPattern/package-summary.html
+++ b/doc/UserFactoryPattern/package-summary.html
@@ -1,154 +1,162 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>UserFactoryPattern</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserFactoryPattern";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/package-summary.html">Prev&nbsp;Package</a></li>
-<li>Next&nbsp;Package</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;UserFactoryPattern</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/package-summary.html">Prev&nbsp;Package</a></li>
-<li>Next&nbsp;Package</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>UserFactoryPattern</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="UserFactoryPattern";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/package-summary.html">Prev&nbsp;Package</a></li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;UserFactoryPattern</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></td>
+<td class="colLast">
+<div class="block">Context to use user factories.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></td>
+<td class="colLast">
+<div class="block">Allow to create human users.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></td>
+<td class="colLast">
+<div class="block">Allow to create generic non human users.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></td>
+<td class="colLast">
+<div class="block">Factory to create factory of abstracted user.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/package-summary.html">Prev&nbsp;Package</a></li>
+<li>Next&nbsp;Package</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/package-tree.html b/doc/UserFactoryPattern/package-tree.html
index 8992ca4..99a0db3 100644
--- a/doc/UserFactoryPattern/package-tree.html
+++ b/doc/UserFactoryPattern/package-tree.html
@@ -1,143 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>UserFactoryPattern Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserFactoryPattern Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/package-tree.html">Prev</a></li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package UserFactoryPattern</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a></li>
-<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a>
-<ul>
-<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a></li>
-<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../User/package-tree.html">Prev</a></li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>UserFactoryPattern Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="UserFactoryPattern Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/package-tree.html">Prev</a></li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package UserFactoryPattern</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a></li>
+<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a>
+<ul>
+<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a></li>
+<li type="circle">UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../User/package-tree.html">Prev</a></li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/UserFactoryPattern/package-use.html b/doc/UserFactoryPattern/package-use.html
index f1a5516..252094b 100644
--- a/doc/UserFactoryPattern/package-use.html
+++ b/doc/UserFactoryPattern/package-use.html
@@ -1,157 +1,159 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package UserFactoryPattern</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package UserFactoryPattern";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package UserFactoryPattern" class="title">Uses of Package<br>UserFactoryPattern</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
-<caption><span>Packages that use <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList"><a name="UserFactoryPattern">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../UserFactoryPattern/class-use/UserFactory.html#UserFactoryPattern">UserFactory</a>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?UserFactoryPattern/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package UserFactoryPattern</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package UserFactoryPattern";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package UserFactoryPattern" class="title">Uses of Package<br>UserFactoryPattern</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#UserFactoryPattern">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="UserFactoryPattern">
+<!--   -->
+</a>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> used by <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../UserFactoryPattern/class-use/UserFactory.html#UserFactoryPattern">UserFactory</a>
+<div class="block">Factory to create factory of abstracted user.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?UserFactoryPattern/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html
index fca4324..2af0906 100644
--- a/doc/allclasses-frame.html
+++ b/doc/allclasses-frame.html
@@ -1,80 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>All Classes</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<h1 class="bar">All&nbsp;Classes</h1>
-<div class="indexContainer">
-<ul>
-<li><a href="Core/ActiveUserContext.html" title="class in Core" target="classFrame">ActiveUserContext</a></li>
-<li><a href="Others/Adress.html" title="class in Others" target="classFrame">Adress</a></li>
-<li><a href="Cards/BasicFidelityCard.html" title="class in Cards" target="classFrame">BasicFidelityCard</a></li>
-<li><a href="Cli/Clui.html" title="class in Cli" target="classFrame">Clui</a></li>
-<li><a href="Cli/Confirm.html" title="class in Cli" target="classFrame">Confirm</a></li>
-<li><a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy" target="classFrame">ContextDeliveryStrategy</a></li>
-<li><a href="Core/ContextStrategy.html" title="interface in Core" target="classFrame"><span class="interfaceName">ContextStrategy</span></a></li>
-<li><a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit" target="classFrame">ContextTargetProfitStrategy</a></li>
-<li><a href="User/Courier.html" title="class in User" target="classFrame">Courier</a></li>
-<li><a href="User/Customer.html" title="class in User" target="classFrame">Customer</a></li>
-<li><a href="Others/Date.html" title="class in Others" target="classFrame">Date</a></li>
-<li><a href="Item/Dessert.html" title="class in Item" target="classFrame">Dessert</a></li>
-<li><a href="Item/Dish.html" title="class in Item" target="classFrame">Dish</a></li>
-<li><a href="provisoire/entities.html" title="class in provisoire" target="classFrame">entities</a></li>
-<li><a href="Exception/ExceptionUnknownDishType.html" title="class in Exception" target="classFrame">ExceptionUnknownDishType</a></li>
-<li><a href="Exception/ExceptionUnknownMealType.html" title="class in Exception" target="classFrame">ExceptionUnknownMealType</a></li>
-<li><a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception" target="classFrame">ExceptionUnknownStartegyType</a></li>
-<li><a href="Item/FactoryDish.html" title="class in Item" target="classFrame">FactoryDish</a></li>
-<li><a href="Item/FactoryMeal.html" title="class in Item" target="classFrame">FactoryMeal</a></li>
-<li><a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern" target="classFrame">FactoryUserFactory</a></li>
-<li><a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy" target="classFrame">FairOccupationDelivery</a></li>
-<li><a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy" target="classFrame">FastestDelivery</a></li>
-<li><a href="Cards/FidelityCard.html" title="class in Cards" target="classFrame">FidelityCard</a></li>
-<li><a href="Item/FullMeal.html" title="class in Item" target="classFrame">FullMeal</a></li>
-<li><a href="Item/HalfMeal.html" title="class in Item" target="classFrame">HalfMeal</a></li>
-<li><a href="Order/HistoricOrder.html" title="class in Order" target="classFrame">HistoricOrder</a></li>
-<li><a href="User/HumanUser.html" title="class in User" target="classFrame">HumanUser</a></li>
-<li><a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern" target="classFrame">HumanUserFactory</a></li>
-<li><a href="Others/IDCard.html" title="class in Others" target="classFrame">IDCard</a></li>
-<li><a href="User/IDUser.html" title="class in User" target="classFrame">IDUser</a></li>
-<li><a href="Cli/Input.html" title="class in Cli" target="classFrame">Input</a></li>
-<li><a href="Item/Item.html" title="class in Item" target="classFrame">Item</a></li>
-<li><a href="User/ListUser.html" title="class in User" target="classFrame">ListUser</a></li>
-<li><a href="Cards/LotteryFidelityCard.html" title="class in Cards" target="classFrame">LotteryFidelityCard</a></li>
-<li><a href="test/main.html" title="class in test" target="classFrame">main</a></li>
-<li><a href="Item/MainDish.html" title="class in Item" target="classFrame">MainDish</a></li>
-<li><a href="User/Manager.html" title="class in User" target="classFrame">Manager</a></li>
-<li><a href="Item/Meal.html" title="class in Item" target="classFrame">Meal</a></li>
-<li><a href="Item/MealFactory.html" title="class in Item" target="classFrame">MealFactory</a></li>
-<li><a href="Offers/MealOfTheWeek.html" title="class in Offers" target="classFrame">MealOfTheWeek</a></li>
-<li><a href="User/MoralUser.html" title="class in User" target="classFrame">MoralUser</a></li>
-<li><a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern" target="classFrame">MoralUserFactory</a></li>
-<li><a href="Core/MyFoodora.html" title="class in Core" target="classFrame">MyFoodora</a></li>
-<li><a href="Offers/ObservableOffer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">ObservableOffer</span></a></li>
-<li><a href="Offers/Observer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">Observer</span></a></li>
-<li><a href="Order/Order.html" title="class in Order" target="classFrame">Order</a></li>
-<li><a href="Others/Period.html" title="class in Others" target="classFrame">Period</a></li>
-<li><a href="Cards/PointFidelityCard.html" title="class in Cards" target="classFrame">PointFidelityCard</a></li>
-<li><a href="Others/Position.html" title="class in Others" target="classFrame">Position</a></li>
-<li><a href="User/Restaurant.html" title="class in User" target="classFrame">Restaurant</a></li>
-<li><a href="Item/Starter.html" title="class in Item" target="classFrame">Starter</a></li>
-<li><a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy" target="classFrame"><span class="interfaceName">StrategyDeliveryPolicy</span></a></li>
-<li><a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit" target="classFrame">StrategyTargetProfitPolicy</a></li>
-<li><a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit" target="classFrame">TargetProfitDeliveryCost</a></li>
-<li><a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit" target="classFrame">TargetProfitMarkup</a></li>
-<li><a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit" target="classFrame">TargetProfitServiceFee</a></li>
-<li><a href="User/User.html" title="class in User" target="classFrame">User</a></li>
-<li><a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern" target="classFrame">UserFactory</a></li>
-<li><a href="Cards/VisitableCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisitableCard</span></a></li>
-<li><a href="Item/VisitablePrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitablePrice</span></a></li>
-<li><a href="Cards/VisiterCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisiterCard</span></a></li>
-<li><a href="Item/VisitorPrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitorPrice</span></a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>All Classes</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="Core/ActiveUserContext.html" title="class in Core" target="classFrame">ActiveUserContext</a></li>
+<li><a href="Commands/AddDishRestaurantMenu.html" title="class in Commands" target="classFrame">AddDishRestaurantMenu</a></li>
+<li><a href="Commands/AddDishToMeal.html" title="class in Commands" target="classFrame">AddDishToMeal</a></li>
+<li><a href="Commands/AddItemToOrder.html" title="class in Commands" target="classFrame">AddItemToOrder</a></li>
+<li><a href="Others/Adress.html" title="class in Others" target="classFrame">Adress</a></li>
+<li><a href="Commands/AssociateCard.html" title="class in Commands" target="classFrame">AssociateCard</a></li>
+<li><a href="Cards/BasicFidelityCard.html" title="class in Cards" target="classFrame">BasicFidelityCard</a></li>
+<li><a href="Offers/BirthdayOffer.html" title="class in Offers" target="classFrame">BirthdayOffer</a></li>
+<li><a href="Cli/Clui.html" title="class in Cli" target="classFrame">Clui</a></li>
+<li><a href="Cli/Command.html" title="class in Cli" target="classFrame">Command</a></li>
+<li><a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy" target="classFrame">ContextDeliveryStrategy</a></li>
+<li><a href="Core/ContextStrategy.html" title="interface in Core" target="classFrame"><span class="interfaceName">ContextStrategy</span></a></li>
+<li><a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit" target="classFrame">ContextTargetProfitStrategy</a></li>
+<li><a href="User/Courier.html" title="class in User" target="classFrame">Courier</a></li>
+<li><a href="Commands/CreateMeal.html" title="class in Commands" target="classFrame">CreateMeal</a></li>
+<li><a href="Commands/CreateOrder.html" title="class in Commands" target="classFrame">CreateOrder</a></li>
+<li><a href="User/Customer.html" title="class in User" target="classFrame">Customer</a></li>
+<li><a href="Others/Date.html" title="class in Others" target="classFrame">Date</a></li>
+<li><a href="Item/Dessert.html" title="class in Item" target="classFrame">Dessert</a></li>
+<li><a href="Item/Dish.html" title="class in Item" target="classFrame">Dish</a></li>
+<li><a href="Commands/EndOrder.html" title="class in Commands" target="classFrame">EndOrder</a></li>
+<li><a href="Commands/EndOrderAt.html" title="class in Commands" target="classFrame">EndOrderAt</a></li>
+<li><a href="Cli/errorWrongFormatValue.html" title="class in Cli" target="classFrame">errorWrongFormatValue</a></li>
+<li><a href="Cli/errorWrongNumberOfParams.html" title="class in Cli" target="classFrame">errorWrongNumberOfParams</a></li>
+<li><a href="Cli/errorWrongTypeOfUser.html" title="class in Cli" target="classFrame">errorWrongTypeOfUser</a></li>
+<li><a href="Exception/ExceptionUnknownDishType.html" title="class in Exception" target="classFrame">ExceptionUnknownDishType</a></li>
+<li><a href="Exception/ExceptionUnknownMealType.html" title="class in Exception" target="classFrame">ExceptionUnknownMealType</a></li>
+<li><a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception" target="classFrame">ExceptionUnknownStartegyType</a></li>
+<li><a href="Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception" target="classFrame">ExceptionUnknownTypeOfUser</a></li>
+<li><a href="Item/FactoryDish.html" title="class in Item" target="classFrame">FactoryDish</a></li>
+<li><a href="Item/FactoryMeal.html" title="class in Item" target="classFrame">FactoryMeal</a></li>
+<li><a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern" target="classFrame">FactoryUserFactory</a></li>
+<li><a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy" target="classFrame">FairOccupationDelivery</a></li>
+<li><a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy" target="classFrame">FastestDelivery</a></li>
+<li><a href="Cards/FidelityCard.html" title="class in Cards" target="classFrame">FidelityCard</a></li>
+<li><a href="Commands/FindDeliverer.html" title="class in Commands" target="classFrame">FindDeliverer</a></li>
+<li><a href="Item/FullMeal.html" title="class in Item" target="classFrame">FullMeal</a></li>
+<li><a href="Item/HalfMeal.html" title="class in Item" target="classFrame">HalfMeal</a></li>
+<li><a href="Commands/Help.html" title="class in Commands" target="classFrame">Help</a></li>
+<li><a href="Order/HistoricOrder.html" title="class in Order" target="classFrame">HistoricOrder</a></li>
+<li><a href="Others/Historique.html" title="class in Others" target="classFrame">Historique</a></li>
+<li><a href="User/HumanUser.html" title="class in User" target="classFrame">HumanUser</a></li>
+<li><a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern" target="classFrame">HumanUserFactory</a></li>
+<li><a href="Others/IDCard.html" title="class in Others" target="classFrame">IDCard</a></li>
+<li><a href="User/IDUser.html" title="class in User" target="classFrame">IDUser</a></li>
+<li><a href="Cli/Input.html" title="class in Cli" target="classFrame">Input</a></li>
+<li><a href="Item/Item.html" title="class in Item" target="classFrame">Item</a></li>
+<li><a href="User/ListUser.html" title="class in User" target="classFrame">ListUser</a></li>
+<li><a href="Commands/Login.html" title="class in Commands" target="classFrame">Login</a></li>
+<li><a href="Commands/Logout.html" title="class in Commands" target="classFrame">Logout</a></li>
+<li><a href="Cards/LotteryFidelityCard.html" title="class in Cards" target="classFrame">LotteryFidelityCard</a></li>
+<li><a href="Core/Main.html" title="class in Core" target="classFrame">Main</a></li>
+<li><a href="Item/MainDish.html" title="class in Item" target="classFrame">MainDish</a></li>
+<li><a href="User/Manager.html" title="class in User" target="classFrame">Manager</a></li>
+<li><a href="Item/Meal.html" title="class in Item" target="classFrame">Meal</a></li>
+<li><a href="Item/MealFactory.html" title="class in Item" target="classFrame">MealFactory</a></li>
+<li><a href="Offers/MealOfTheWeek.html" title="class in Offers" target="classFrame">MealOfTheWeek</a></li>
+<li><a href="User/MoralUser.html" title="class in User" target="classFrame">MoralUser</a></li>
+<li><a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern" target="classFrame">MoralUserFactory</a></li>
+<li><a href="Core/MyFoodora.html" title="class in Core" target="classFrame">MyFoodora</a></li>
+<li><a href="Offers/ObservableOffer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">ObservableOffer</span></a></li>
+<li><a href="Offers/Observer.html" title="interface in Offers" target="classFrame"><span class="interfaceName">Observer</span></a></li>
+<li><a href="Commands/OffDuty.html" title="class in Commands" target="classFrame">OffDuty</a></li>
+<li><a href="Commands/OnDuty.html" title="class in Commands" target="classFrame">OnDuty</a></li>
+<li><a href="Order/Order.html" title="class in Order" target="classFrame">Order</a></li>
+<li><a href="Others/Period.html" title="class in Others" target="classFrame">Period</a></li>
+<li><a href="Cards/PointFidelityCard.html" title="class in Cards" target="classFrame">PointFidelityCard</a></li>
+<li><a href="Others/Position.html" title="class in Others" target="classFrame">Position</a></li>
+<li><a href="Commands/RegisterCourier.html" title="class in Commands" target="classFrame">RegisterCourier</a></li>
+<li><a href="Commands/RegisterCustomer.html" title="class in Commands" target="classFrame">RegisterCustomer</a></li>
+<li><a href="Commands/RegisterManager.html" title="class in Commands" target="classFrame">RegisterManager</a></li>
+<li><a href="Commands/RegisterRestaurant.html" title="class in Commands" target="classFrame">RegisterRestaurant</a></li>
+<li><a href="Commands/RemoveSpecialOffer.html" title="class in Commands" target="classFrame">RemoveSpecialOffer</a></li>
+<li><a href="Commands/RenameMeal.html" title="class in Commands" target="classFrame">RenameMeal</a></li>
+<li><a href="User/Restaurant.html" title="class in User" target="classFrame">Restaurant</a></li>
+<li><a href="Commands/RunTest.html" title="class in Commands" target="classFrame">RunTest</a></li>
+<li><a href="Commands/SetDeliveryPolicy.html" title="class in Commands" target="classFrame">SetDeliveryPolicy</a></li>
+<li><a href="Commands/SetProfitPolicy.html" title="class in Commands" target="classFrame">SetProfitPolicy</a></li>
+<li><a href="Commands/SetSpecialOffer.html" title="class in Commands" target="classFrame">SetSpecialOffer</a></li>
+<li><a href="Commands/ShowCourier.html" title="class in Commands" target="classFrame">ShowCourier</a></li>
+<li><a href="Commands/ShowCourierOrdered.html" title="class in Commands" target="classFrame">ShowCourierOrdered</a></li>
+<li><a href="Commands/ShowCustomer.html" title="class in Commands" target="classFrame">ShowCustomer</a></li>
+<li><a href="Commands/ShowMeal.html" title="class in Commands" target="classFrame">ShowMeal</a></li>
+<li><a href="Commands/ShowMenuItem.html" title="class in Commands" target="classFrame">ShowMenuItem</a></li>
+<li><a href="Commands/ShowProfitBetween.html" title="class in Commands" target="classFrame">ShowProfitBetween</a></li>
+<li><a href="Commands/ShowRestaurantTop.html" title="class in Commands" target="classFrame">ShowRestaurantTop</a></li>
+<li><a href="Commands/ShowTotalProfit.html" title="class in Commands" target="classFrame">ShowTotalProfit</a></li>
+<li><a href="Item/Starter.html" title="class in Item" target="classFrame">Starter</a></li>
+<li><a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy" target="classFrame">StrategyDeliveryPolicy</a></li>
+<li><a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit" target="classFrame">StrategyTargetProfitPolicy</a></li>
+<li><a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit" target="classFrame">TargetProfitDeliveryCost</a></li>
+<li><a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit" target="classFrame">TargetProfitMarkup</a></li>
+<li><a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit" target="classFrame">TargetProfitServiceFee</a></li>
+<li><a href="test/TestCard.html" title="class in test" target="classFrame">TestCard</a></li>
+<li><a href="test/TestCli.html" title="class in test" target="classFrame">TestCli</a></li>
+<li><a href="test/TestCore.html" title="class in test" target="classFrame">TestCore</a></li>
+<li><a href="test/TestCourier.html" title="class in test" target="classFrame">TestCourier</a></li>
+<li><a href="test/TestCustomer.html" title="class in test" target="classFrame">TestCustomer</a></li>
+<li><a href="test/TestDeliveryStrategy.html" title="class in test" target="classFrame">TestDeliveryStrategy</a></li>
+<li><a href="test/TestException.html" title="class in test" target="classFrame">TestException</a></li>
+<li><a href="test/TestItem.html" title="class in test" target="classFrame">TestItem</a></li>
+<li><a href="test/TestManager.html" title="class in test" target="classFrame">TestManager</a></li>
+<li><a href="test/TestOffers.html" title="class in test" target="classFrame">TestOffers</a></li>
+<li><a href="test/TestOrder.html" title="class in test" target="classFrame">TestOrder</a></li>
+<li><a href="test/TestOthers.html" title="class in test" target="classFrame">TestOthers</a></li>
+<li><a href="test/TestRestaurant.html" title="class in test" target="classFrame">TestRestaurant</a></li>
+<li><a href="test/TestTargetProfitStrategy.html" title="class in test" target="classFrame">TestTargetProfitStrategy</a></li>
+<li><a href="test/TestUserFactory.html" title="class in test" target="classFrame">TestUserFactory</a></li>
+<li><a href="Cli/Token.html" title="class in Cli" target="classFrame">Token</a></li>
+<li><a href="Cli/Token.TypeToken.html" title="enum in Cli" target="classFrame">Token.TypeToken</a></li>
+<li><a href="User/User.html" title="class in User" target="classFrame">User</a></li>
+<li><a href="User/UserFactory.html" title="class in User" target="classFrame">UserFactory</a></li>
+<li><a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern" target="classFrame">UserFactory</a></li>
+<li><a href="Cards/VisitableCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisitableCard</span></a></li>
+<li><a href="Item/VisitablePrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitablePrice</span></a></li>
+<li><a href="Cards/VisiterCard.html" title="interface in Cards" target="classFrame"><span class="interfaceName">VisiterCard</span></a></li>
+<li><a href="Item/VisitorPrice.html" title="interface in Item" target="classFrame"><span class="interfaceName">VisitorPrice</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html
index b4fc244..c5939c4 100644
--- a/doc/allclasses-noframe.html
+++ b/doc/allclasses-noframe.html
@@ -1,80 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>All Classes</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<h1 class="bar">All&nbsp;Classes</h1>
-<div class="indexContainer">
-<ul>
-<li><a href="Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></li>
-<li><a href="Others/Adress.html" title="class in Others">Adress</a></li>
-<li><a href="Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></li>
-<li><a href="Cli/Clui.html" title="class in Cli">Clui</a></li>
-<li><a href="Cli/Confirm.html" title="class in Cli">Confirm</a></li>
-<li><a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></li>
-<li><a href="Core/ContextStrategy.html" title="interface in Core"><span class="interfaceName">ContextStrategy</span></a></li>
-<li><a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></li>
-<li><a href="User/Courier.html" title="class in User">Courier</a></li>
-<li><a href="User/Customer.html" title="class in User">Customer</a></li>
-<li><a href="Others/Date.html" title="class in Others">Date</a></li>
-<li><a href="Item/Dessert.html" title="class in Item">Dessert</a></li>
-<li><a href="Item/Dish.html" title="class in Item">Dish</a></li>
-<li><a href="provisoire/entities.html" title="class in provisoire">entities</a></li>
-<li><a href="Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></li>
-<li><a href="Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></li>
-<li><a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></li>
-<li><a href="Item/FactoryDish.html" title="class in Item">FactoryDish</a></li>
-<li><a href="Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></li>
-<li><a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></li>
-<li><a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></li>
-<li><a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></li>
-<li><a href="Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></li>
-<li><a href="Item/FullMeal.html" title="class in Item">FullMeal</a></li>
-<li><a href="Item/HalfMeal.html" title="class in Item">HalfMeal</a></li>
-<li><a href="Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></li>
-<li><a href="User/HumanUser.html" title="class in User">HumanUser</a></li>
-<li><a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></li>
-<li><a href="Others/IDCard.html" title="class in Others">IDCard</a></li>
-<li><a href="User/IDUser.html" title="class in User">IDUser</a></li>
-<li><a href="Cli/Input.html" title="class in Cli">Input</a></li>
-<li><a href="Item/Item.html" title="class in Item">Item</a></li>
-<li><a href="User/ListUser.html" title="class in User">ListUser</a></li>
-<li><a href="Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></li>
-<li><a href="test/main.html" title="class in test">main</a></li>
-<li><a href="Item/MainDish.html" title="class in Item">MainDish</a></li>
-<li><a href="User/Manager.html" title="class in User">Manager</a></li>
-<li><a href="Item/Meal.html" title="class in Item">Meal</a></li>
-<li><a href="Item/MealFactory.html" title="class in Item">MealFactory</a></li>
-<li><a href="Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></li>
-<li><a href="User/MoralUser.html" title="class in User">MoralUser</a></li>
-<li><a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></li>
-<li><a href="Core/MyFoodora.html" title="class in Core">MyFoodora</a></li>
-<li><a href="Offers/ObservableOffer.html" title="interface in Offers"><span class="interfaceName">ObservableOffer</span></a></li>
-<li><a href="Offers/Observer.html" title="interface in Offers"><span class="interfaceName">Observer</span></a></li>
-<li><a href="Order/Order.html" title="class in Order">Order</a></li>
-<li><a href="Others/Period.html" title="class in Others">Period</a></li>
-<li><a href="Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></li>
-<li><a href="Others/Position.html" title="class in Others">Position</a></li>
-<li><a href="User/Restaurant.html" title="class in User">Restaurant</a></li>
-<li><a href="Item/Starter.html" title="class in Item">Starter</a></li>
-<li><a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="interfaceName">StrategyDeliveryPolicy</span></a></li>
-<li><a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></li>
-<li><a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></li>
-<li><a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></li>
-<li><a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></li>
-<li><a href="User/User.html" title="class in User">User</a></li>
-<li><a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></li>
-<li><a href="Cards/VisitableCard.html" title="interface in Cards"><span class="interfaceName">VisitableCard</span></a></li>
-<li><a href="Item/VisitablePrice.html" title="interface in Item"><span class="interfaceName">VisitablePrice</span></a></li>
-<li><a href="Cards/VisiterCard.html" title="interface in Cards"><span class="interfaceName">VisiterCard</span></a></li>
-<li><a href="Item/VisitorPrice.html" title="interface in Item"><span class="interfaceName">VisitorPrice</span></a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>All Classes</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></li>
+<li><a href="Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a></li>
+<li><a href="Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a></li>
+<li><a href="Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a></li>
+<li><a href="Others/Adress.html" title="class in Others">Adress</a></li>
+<li><a href="Commands/AssociateCard.html" title="class in Commands">AssociateCard</a></li>
+<li><a href="Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></li>
+<li><a href="Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></li>
+<li><a href="Cli/Clui.html" title="class in Cli">Clui</a></li>
+<li><a href="Cli/Command.html" title="class in Cli">Command</a></li>
+<li><a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></li>
+<li><a href="Core/ContextStrategy.html" title="interface in Core"><span class="interfaceName">ContextStrategy</span></a></li>
+<li><a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></li>
+<li><a href="User/Courier.html" title="class in User">Courier</a></li>
+<li><a href="Commands/CreateMeal.html" title="class in Commands">CreateMeal</a></li>
+<li><a href="Commands/CreateOrder.html" title="class in Commands">CreateOrder</a></li>
+<li><a href="User/Customer.html" title="class in User">Customer</a></li>
+<li><a href="Others/Date.html" title="class in Others">Date</a></li>
+<li><a href="Item/Dessert.html" title="class in Item">Dessert</a></li>
+<li><a href="Item/Dish.html" title="class in Item">Dish</a></li>
+<li><a href="Commands/EndOrder.html" title="class in Commands">EndOrder</a></li>
+<li><a href="Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a></li>
+<li><a href="Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></li>
+<li><a href="Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></li>
+<li><a href="Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></li>
+<li><a href="Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></li>
+<li><a href="Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></li>
+<li><a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></li>
+<li><a href="Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></li>
+<li><a href="Item/FactoryDish.html" title="class in Item">FactoryDish</a></li>
+<li><a href="Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></li>
+<li><a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></li>
+<li><a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></li>
+<li><a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></li>
+<li><a href="Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></li>
+<li><a href="Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a></li>
+<li><a href="Item/FullMeal.html" title="class in Item">FullMeal</a></li>
+<li><a href="Item/HalfMeal.html" title="class in Item">HalfMeal</a></li>
+<li><a href="Commands/Help.html" title="class in Commands">Help</a></li>
+<li><a href="Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></li>
+<li><a href="Others/Historique.html" title="class in Others">Historique</a></li>
+<li><a href="User/HumanUser.html" title="class in User">HumanUser</a></li>
+<li><a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></li>
+<li><a href="Others/IDCard.html" title="class in Others">IDCard</a></li>
+<li><a href="User/IDUser.html" title="class in User">IDUser</a></li>
+<li><a href="Cli/Input.html" title="class in Cli">Input</a></li>
+<li><a href="Item/Item.html" title="class in Item">Item</a></li>
+<li><a href="User/ListUser.html" title="class in User">ListUser</a></li>
+<li><a href="Commands/Login.html" title="class in Commands">Login</a></li>
+<li><a href="Commands/Logout.html" title="class in Commands">Logout</a></li>
+<li><a href="Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></li>
+<li><a href="Core/Main.html" title="class in Core">Main</a></li>
+<li><a href="Item/MainDish.html" title="class in Item">MainDish</a></li>
+<li><a href="User/Manager.html" title="class in User">Manager</a></li>
+<li><a href="Item/Meal.html" title="class in Item">Meal</a></li>
+<li><a href="Item/MealFactory.html" title="class in Item">MealFactory</a></li>
+<li><a href="Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></li>
+<li><a href="User/MoralUser.html" title="class in User">MoralUser</a></li>
+<li><a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></li>
+<li><a href="Core/MyFoodora.html" title="class in Core">MyFoodora</a></li>
+<li><a href="Offers/ObservableOffer.html" title="interface in Offers"><span class="interfaceName">ObservableOffer</span></a></li>
+<li><a href="Offers/Observer.html" title="interface in Offers"><span class="interfaceName">Observer</span></a></li>
+<li><a href="Commands/OffDuty.html" title="class in Commands">OffDuty</a></li>
+<li><a href="Commands/OnDuty.html" title="class in Commands">OnDuty</a></li>
+<li><a href="Order/Order.html" title="class in Order">Order</a></li>
+<li><a href="Others/Period.html" title="class in Others">Period</a></li>
+<li><a href="Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></li>
+<li><a href="Others/Position.html" title="class in Others">Position</a></li>
+<li><a href="Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a></li>
+<li><a href="Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a></li>
+<li><a href="Commands/RegisterManager.html" title="class in Commands">RegisterManager</a></li>
+<li><a href="Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a></li>
+<li><a href="Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a></li>
+<li><a href="Commands/RenameMeal.html" title="class in Commands">RenameMeal</a></li>
+<li><a href="User/Restaurant.html" title="class in User">Restaurant</a></li>
+<li><a href="Commands/RunTest.html" title="class in Commands">RunTest</a></li>
+<li><a href="Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a></li>
+<li><a href="Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a></li>
+<li><a href="Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a></li>
+<li><a href="Commands/ShowCourier.html" title="class in Commands">ShowCourier</a></li>
+<li><a href="Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a></li>
+<li><a href="Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a></li>
+<li><a href="Commands/ShowMeal.html" title="class in Commands">ShowMeal</a></li>
+<li><a href="Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a></li>
+<li><a href="Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a></li>
+<li><a href="Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a></li>
+<li><a href="Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></li>
+<li><a href="Item/Starter.html" title="class in Item">Starter</a></li>
+<li><a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></li>
+<li><a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></li>
+<li><a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></li>
+<li><a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></li>
+<li><a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></li>
+<li><a href="test/TestCard.html" title="class in test">TestCard</a></li>
+<li><a href="test/TestCli.html" title="class in test">TestCli</a></li>
+<li><a href="test/TestCore.html" title="class in test">TestCore</a></li>
+<li><a href="test/TestCourier.html" title="class in test">TestCourier</a></li>
+<li><a href="test/TestCustomer.html" title="class in test">TestCustomer</a></li>
+<li><a href="test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></li>
+<li><a href="test/TestException.html" title="class in test">TestException</a></li>
+<li><a href="test/TestItem.html" title="class in test">TestItem</a></li>
+<li><a href="test/TestManager.html" title="class in test">TestManager</a></li>
+<li><a href="test/TestOffers.html" title="class in test">TestOffers</a></li>
+<li><a href="test/TestOrder.html" title="class in test">TestOrder</a></li>
+<li><a href="test/TestOthers.html" title="class in test">TestOthers</a></li>
+<li><a href="test/TestRestaurant.html" title="class in test">TestRestaurant</a></li>
+<li><a href="test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></li>
+<li><a href="test/TestUserFactory.html" title="class in test">TestUserFactory</a></li>
+<li><a href="Cli/Token.html" title="class in Cli">Token</a></li>
+<li><a href="Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></li>
+<li><a href="User/User.html" title="class in User">User</a></li>
+<li><a href="User/UserFactory.html" title="class in User">UserFactory</a></li>
+<li><a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></li>
+<li><a href="Cards/VisitableCard.html" title="interface in Cards"><span class="interfaceName">VisitableCard</span></a></li>
+<li><a href="Item/VisitablePrice.html" title="interface in Item"><span class="interfaceName">VisitablePrice</span></a></li>
+<li><a href="Cards/VisiterCard.html" title="interface in Cards"><span class="interfaceName">VisiterCard</span></a></li>
+<li><a href="Item/VisitorPrice.html" title="interface in Item"><span class="interfaceName">VisitorPrice</span></a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/constant-values.html b/doc/constant-values.html
index d6a24cf..8af5573 100644
--- a/doc/constant-values.html
+++ b/doc/constant-values.html
@@ -1,335 +1,906 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Constant Field Values</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
-<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
-<h2 title="Contents">Contents</h2>
-<ul>
-<li><a href="#Core">Core.*</a></li>
-<li><a href="#User">User.*</a></li>
-</ul>
-</div>
-<div class="constantValuesContainer"><a name="Core">
-<!--   -->
-</a>
-<h2 title="Core">Core.*</h2>
-<ul class="blockList">
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>Core.<a href="Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="Core.MyFoodora.COURIER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="Core/MyFoodora.html#COURIER">COURIER</a></code></td>
-<td class="colLast"><code>1</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="Core.MyFoodora.CUSTOMER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></code></td>
-<td class="colLast"><code>3</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="Core.MyFoodora.MANAGER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="Core/MyFoodora.html#MANAGER">MANAGER</a></code></td>
-<td class="colLast"><code>4</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="Core.MyFoodora.RESTAURANT">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></code></td>
-<td class="colLast"><code>2</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="Core.MyFoodora.UNKNOWN">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></code></td>
-<td class="colLast"><code>0</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="User">
-<!--   -->
-</a>
-<h2 title="User">User.*</h2>
-<ul class="blockList">
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>User.<a href="User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="User.Manager.COURIER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/Manager.html#COURIER">COURIER</a></code></td>
-<td class="colLast"><code>1</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="User.Manager.CUSTOMER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/Manager.html#CUSTOMER">CUSTOMER</a></code></td>
-<td class="colLast"><code>3</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="User.Manager.MANAGER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/Manager.html#MANAGER">MANAGER</a></code></td>
-<td class="colLast"><code>4</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="User.Manager.RESTAURANT">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/Manager.html#RESTAURANT">RESTAURANT</a></code></td>
-<td class="colLast"><code>2</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="User.Manager.UNKNOWN">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/Manager.html#UNKNOWN">UNKNOWN</a></code></td>
-<td class="colLast"><code>0</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>User.<a href="User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="User.User.COURIER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/User.html#COURIER">COURIER</a></code></td>
-<td class="colLast"><code>1</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="User.User.CUSTOMER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/User.html#CUSTOMER">CUSTOMER</a></code></td>
-<td class="colLast"><code>3</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="User.User.MANAGER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/User.html#MANAGER">MANAGER</a></code></td>
-<td class="colLast"><code>4</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="User.User.RESTAURANT">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/User.html#RESTAURANT">RESTAURANT</a></code></td>
-<td class="colLast"><code>2</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="User.User.UNKNOWN">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="User/User.html#UNKNOWN">UNKNOWN</a></code></td>
-<td class="colLast"><code>0</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="UserFactoryPattern">
-<!--   -->
-</a>
-<h2 title="UserFactoryPattern">UserFactoryPattern.*</h2>
-<ul class="blockList">
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>UserFactoryPattern.<a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="UserFactoryPattern.UserFactory.COURIER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></code></td>
-<td class="colLast"><code>1</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="UserFactoryPattern.UserFactory.CUSTOMER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></code></td>
-<td class="colLast"><code>3</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="UserFactoryPattern.UserFactory.MANAGER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></code></td>
-<td class="colLast"><code>4</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="UserFactoryPattern.UserFactory.RESTAURANT">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></code></td>
-<td class="colLast"><code>2</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="UserFactoryPattern.UserFactory.UNKNOWN">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></td>
-<td class="colLast"><code>0</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
-<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Constant Field Values</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#Core">Core.*</a></li>
+<li><a href="#test">test.*</a></li>
+<li><a href="#User">User.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="Core">
+<!--   -->
+</a>
+<h2 title="Core">Core.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>Core.<a href="Core/MyFoodora.html" title="class in Core">MyFoodora</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="Core.MyFoodora.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="Core/MyFoodora.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="Core.MyFoodora.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="Core.MyFoodora.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="Core/MyFoodora.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="Core.MyFoodora.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="Core.MyFoodora.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<a name="test">
+<!--   -->
+</a>
+<h2 title="test">test.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestCard.html" title="class in test">TestCard</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCard.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCard.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCard.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCard.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCard.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCard.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCard.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCard.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCard.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCard.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestCore.html" title="class in test">TestCore</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCore.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCore.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCore.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCore.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCore.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCore.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCore.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCore.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCore.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCore.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestCourier.html" title="class in test">TestCourier</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCourier.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCourier.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCourier.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCourier.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCourier.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCourier.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCourier.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCourier.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCourier.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCourier.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestCustomer.html" title="class in test">TestCustomer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCustomer.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCustomer.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCustomer.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCustomer.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCustomer.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCustomer.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestCustomer.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCustomer.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestCustomer.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestCustomer.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestDeliveryStrategy.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestDeliveryStrategy.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestDeliveryStrategy.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestDeliveryStrategy.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestDeliveryStrategy.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestDeliveryStrategy.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestDeliveryStrategy.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestDeliveryStrategy.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestDeliveryStrategy.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestDeliveryStrategy.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestException.html" title="class in test">TestException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestException.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestException.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestException.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestException.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestException.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestException.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestException.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestException.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestException.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestException.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestManager.html" title="class in test">TestManager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestManager.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestManager.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestManager.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestManager.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestManager.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestManager.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestManager.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestManager.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestManager.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestManager.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestOffers.html" title="class in test">TestOffers</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestOffers.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestOffers.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestOffers.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestOffers.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestOffers.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestOffers.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestOffers.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestOffers.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestOffers.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestOffers.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestRestaurant.html" title="class in test">TestRestaurant</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestRestaurant.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestRestaurant.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestRestaurant.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestRestaurant.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestRestaurant.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestRestaurant.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestRestaurant.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestRestaurant.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestRestaurant.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestRestaurant.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestTargetProfitStrategy.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestTargetProfitStrategy.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestTargetProfitStrategy.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestTargetProfitStrategy.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestTargetProfitStrategy.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestTargetProfitStrategy.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestTargetProfitStrategy.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestTargetProfitStrategy.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestTargetProfitStrategy.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestTargetProfitStrategy.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>test.<a href="test/TestUserFactory.html" title="class in test">TestUserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestUserFactory.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestUserFactory.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestUserFactory.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestUserFactory.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestUserFactory.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestUserFactory.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="test.TestUserFactory.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestUserFactory.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="test.TestUserFactory.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="test/TestUserFactory.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<a name="User">
+<!--   -->
+</a>
+<h2 title="User">User.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>User.<a href="User/Customer.html" title="class in User">Customer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Customer.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Customer.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.Customer.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Customer.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Customer.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Customer.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.Customer.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Customer.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Customer.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Customer.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>User.<a href="User/Manager.html" title="class in User">Manager</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Manager.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Manager.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.Manager.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Manager.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Manager.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Manager.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.Manager.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Manager.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.Manager.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/Manager.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>User.<a href="User/User.html" title="class in User">User</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="User.User.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/User.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.User.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/User.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.User.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/User.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="User.User.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/User.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="User.User.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="User/User.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<a name="UserFactoryPattern">
+<!--   -->
+</a>
+<h2 title="UserFactoryPattern">UserFactoryPattern.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>UserFactoryPattern.<a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="UserFactoryPattern.UserFactory.COURIER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="UserFactoryPattern.UserFactory.CUSTOMER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="UserFactoryPattern.UserFactory.MANAGER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></code></td>
+<td class="colLast"><code>4</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="UserFactoryPattern.UserFactory.RESTAURANT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></code></td>
+<td class="colLast"><code>2</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="UserFactoryPattern.UserFactory.UNKNOWN">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></code></td>
+<td class="colLast"><code>0</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html
index faa5b8a..f9cbba1 100644
--- a/doc/deprecated-list.html
+++ b/doc/deprecated-list.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Deprecated List</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li class="navBarCell1Rev">Deprecated</li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
-<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Deprecated API" class="title">Deprecated API</h1>
-<h2 title="Contents">Contents</h2>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li class="navBarCell1Rev">Deprecated</li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
-<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>Deprecated List</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Deprecated List";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/help-doc.html b/doc/help-doc.html
index 39c805d..a79702e 100644
--- a/doc/help-doc.html
+++ b/doc/help-doc.html
@@ -1,229 +1,229 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>API Help</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li class="navBarCell1Rev">Help</li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
-<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">How This API Document Is Organized</h1>
-<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<h2>Overview</h2>
-<p>The <a href="overview-summary.html">Overview</a> page is the front page of this API document and provides a list of all packages with a summary for each.  This page can also contain an overall description of the set of packages.</p>
-</li>
-<li class="blockList">
-<h2>Package</h2>
-<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
-<ul>
-<li>Interfaces (italic)</li>
-<li>Classes</li>
-<li>Enums</li>
-<li>Exceptions</li>
-<li>Errors</li>
-<li>Annotation Types</li>
-</ul>
-</li>
-<li class="blockList">
-<h2>Class/Interface</h2>
-<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
-<ul>
-<li>Class inheritance diagram</li>
-<li>Direct Subclasses</li>
-<li>All Known Subinterfaces</li>
-<li>All Known Implementing Classes</li>
-<li>Class/interface declaration</li>
-<li>Class/interface description</li>
-</ul>
-<ul>
-<li>Nested Class Summary</li>
-<li>Field Summary</li>
-<li>Constructor Summary</li>
-<li>Method Summary</li>
-</ul>
-<ul>
-<li>Field Detail</li>
-<li>Constructor Detail</li>
-<li>Method Detail</li>
-</ul>
-<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
-</li>
-<li class="blockList">
-<h2>Annotation Type</h2>
-<p>Each annotation type has its own separate page with the following sections:</p>
-<ul>
-<li>Annotation Type declaration</li>
-<li>Annotation Type description</li>
-<li>Required Element Summary</li>
-<li>Optional Element Summary</li>
-<li>Element Detail</li>
-</ul>
-</li>
-<li class="blockList">
-<h2>Enum</h2>
-<p>Each enum has its own separate page with the following sections:</p>
-<ul>
-<li>Enum declaration</li>
-<li>Enum description</li>
-<li>Enum Constant Summary</li>
-<li>Enum Constant Detail</li>
-</ul>
-</li>
-<li class="blockList">
-<h2>Use</h2>
-<p>Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</p>
-</li>
-<li class="blockList">
-<h2>Tree (Class Hierarchy)</h2>
-<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
-<ul>
-<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
-<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
-</ul>
-</li>
-<li class="blockList">
-<h2>Deprecated API</h2>
-<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
-</li>
-<li class="blockList">
-<h2>Index</h2>
-<p>The <a href="index-files/index-1.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
-</li>
-<li class="blockList">
-<h2>Prev/Next</h2>
-<p>These links take you to the next or previous class, interface, package, or related page.</p>
-</li>
-<li class="blockList">
-<h2>Frames/No Frames</h2>
-<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
-</li>
-<li class="blockList">
-<h2>All Classes</h2>
-<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
-</li>
-<li class="blockList">
-<h2>Serialized Form</h2>
-<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
-</li>
-<li class="blockList">
-<h2>Constant Field Values</h2>
-<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
-</li>
-</ul>
-<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li class="navBarCell1Rev">Help</li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
-<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>API Help</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="API Help";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Overview</h2>
+<p>The <a href="overview-summary.html">Overview</a> page is the front page of this API document and provides a list of all packages with a summary for each.  This page can also contain an overall description of the set of packages.</p>
+</li>
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Use</h2>
+<p>Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</p>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-files/index-1.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<span class="emphasizedPhrase">This help file applies to API documentation generated using the standard doclet.</span></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-1.html b/doc/index-files/index-1.html
index be4da2a..a7d5984 100644
--- a/doc/index-files/index-1.html
+++ b/doc/index-files/index-1.html
@@ -1,195 +1,223 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>A-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="A-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev Letter</li>
-<li><a href="index-2.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-1.html" target="_top">Frames</a></li>
-<li><a href="index-1.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:A">
-<!--   -->
-</a>
-<h2 class="title">A</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#accept--">accept()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#accept--">accept()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#accept--">accept()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/VisitableCard.html#accept--">accept()</a></span> - Method in interface Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery(Order)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#acceptPrice-Item.VisitorPrice-">acceptPrice(VisitorPrice)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>
-<div class="block">VISIT LOGIC</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#acceptPrice-Item.VisitorPrice-">acceptPrice(VisitorPrice)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>
-<div class="block">VISIT LOGIC</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice(VisitorPrice)</a></span> - Method in interface Item.<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#acceptSpam--">acceptSpam()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser(MyFoodora, User)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a> - Class in <a href="../Core/package-summary.html">Core</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext(MyFoodora)</a></span> - Constructor for class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Dish-">add(Dish)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>
-<div class="block">AND & REMOVE</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Meal-">add(Meal)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCourier-User.Courier-">addCourier(Courier)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer(Customer)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#addDish-Item.Dish-">addDish(Dish)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>
-<div class="block">add and remove dishes</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addDish-Item.Dish-">addDish(Dish)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addManager-User.Manager-">addManager(Manager)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addMeal-Item.Meal-">addMeal(Meal)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>
-<div class="block">SETTERS</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder(Order)</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant(Restaurant)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addUser-User.User-">addUser(User)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#addUser-T-">addUser(T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser(long, String, String, String, String, Adress, boolean, String, String, MyFoodora, int, String)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#Adress-double-double-">Adress(double, double)</a></span> - Constructor for class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver(Observer)</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev Letter</li>
-<li><a href="index-2.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-1.html" target="_top">Frames</a></li>
-<li><a href="index-1.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>A-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="A-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Letter</li>
+<li><a href="index-2.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-1.html" target="_top">Frames</a></li>
+<li><a href="index-1.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:A">
+<!--   -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#acceptDelivery-Order.Order-">acceptDelivery(Order)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#acceptPercentage--">acceptPercentage()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#acceptPercentage--">acceptPercentage()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#acceptPercentage--">acceptPercentage()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/VisitableCard.html#acceptPercentage--">acceptPercentage()</a></span> - Method in interface Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#acceptPoint--">acceptPoint()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#acceptPoint--">acceptPoint()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#acceptPoint--">acceptPoint()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/VisitableCard.html#acceptPoint--">acceptPoint()</a></span> - Method in interface Cards.<a href="../Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/VisitablePrice.html#acceptPrice-Item.VisitorPrice-">acceptPrice(VisitorPrice)</a></span> - Method in interface Item.<a href="../Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#acceptSpam--">acceptSpam()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#activateUser-Core.MyFoodora-User.User-">activateUser(MyFoodora, User)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a> - Class in <a href="../Core/package-summary.html">Core</a></dt>
+<dd>
+<div class="block">A session Class, it allow the user to be plugged to the Clui and not IN the Clui.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#ActiveUserContext-Core.MyFoodora-">ActiveUserContext(MyFoodora)</a></span> - Constructor for class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Dish-">add(Dish)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#add-Item.Meal-">add(Meal)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCourier-User.Courier-">addCourier(Courier)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addCustomer-User.Customer-">addCustomer(Customer)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#addDish-Item.Dish-">addDish(Dish)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>
+<div class="block">add and remove dishes</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addDish-java.lang.String-java.lang.String-java.lang.String-double-">addDish(String, String, String, double)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands"><span class="typeNameLink">AddDishRestaurantMenu</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddDishRestaurantMenu.html#AddDishRestaurantMenu--">AddDishRestaurantMenu()</a></span> - Constructor for class Commands.<a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">AddDishToMeal</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddDishToMeal.html#AddDishToMeal--">AddDishToMeal()</a></span> - Constructor for class Commands.<a href="../Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addDishToMeal-Item.Dish-Item.Meal-">addDishToMeal(Dish, Meal)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#addItemByName-java.lang.String-">addItemByName(String)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>
+<div class="block">ADD & REMOVE</div>
+</dd>
+<dt><a href="../Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">AddItemToOrder</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddItemToOrder.html#AddItemToOrder--">AddItemToOrder()</a></span> - Constructor for class Commands.<a href="../Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addManager-User.Manager-">addManager(Manager)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addMeal-java.lang.String-java.lang.String-java.util.ArrayList-">addMeal(String, String, ArrayList&lt;Dish&gt;)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>
+<div class="block">SETTERS</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#addMealOfTheWeek-Core.MyFoodora-java.lang.String-">addMealOfTheWeek(MyFoodora, String)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#addOrder-Order.Order-">addOrder(Order)</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addRestaurant-User.Restaurant-">addRestaurant(Restaurant)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#addUser-User.User-">addUser(User)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#addUser-T-">addUser(T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#addUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-Core.MyFoodora-int-java.lang.String-">addUser(long, String, String, String, String, Adress, boolean, String, String, MyFoodora, int, String)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>
+<div class="block">x,y representation of an adress</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#Adress-double-double-">Adress(double, double)</a></span> - Constructor for class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">AssociateCard</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AssociateCard.html#AssociateCard--">AssociateCard()</a></span> - Constructor for class Commands.<a href="../Commands/AssociateCard.html" title="class in Commands">AssociateCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#attachObserver-Offers.Observer-">attachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#attachObserver-Offers.Observer-">attachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#attachObserver-Offers.Observer-">attachObserver(Observer)</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Letter</li>
+<li><a href="index-2.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-1.html" target="_top">Frames</a></li>
+<li><a href="index-1.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-10.html b/doc/index-files/index-10.html
index 6081506..dca7c9d 100644
--- a/doc/index-files/index-10.html
+++ b/doc/index-files/index-10.html
@@ -1,139 +1,149 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>L-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="L-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-9.html">Prev Letter</a></li>
-<li><a href="index-11.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-10.html" target="_top">Frames</a></li>
-<li><a href="index-10.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:L">
-<!--   -->
-</a>
-<h2 class="title">L</h2>
-<dl>
-<dt><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a> extends <a href="../User/User.html" title="class in User">User</a>&gt; - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#ListUser--">ListUser()</a></span> - Constructor for class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#login-Core.MyFoodora-">login(MyFoodora)</a></span> - Static method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>
-<div class="block">CUSTOM</div>
-</dd>
-<dt><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#LotteryFidelityCard-double-">LotteryFidelityCard(double)</a></span> - Constructor for class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-9.html">Prev Letter</a></li>
-<li><a href="index-11.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-10.html" target="_top">Frames</a></li>
-<li><a href="index-10.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>L-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="L-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-9.html">Prev Letter</a></li>
+<li><a href="index-11.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-10.html" target="_top">Frames</a></li>
+<li><a href="index-10.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:L">
+<!--   -->
+</a>
+<h2 class="title">L</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../Cli/Clui.html#launchClui--">launchClui()</a></span> - Method in class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;<a href="../User/ListUser.html" title="type parameter in ListUser">T</a> extends <a href="../User/User.html" title="class in User">User</a>&gt; - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Gives methods and form to use and manage list of users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#ListUser--">ListUser()</a></span> - Constructor for class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/Login.html" title="class in Commands"><span class="typeNameLink">Login</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Login.html#Login--">Login()</a></span> - Constructor for class Commands.<a href="../Commands/Login.html" title="class in Commands">Login</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Logout</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Logout.html#Logout--">Logout()</a></span> - Constructor for class Commands.<a href="../Commands/Logout.html" title="class in Commands">Logout</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>
+<div class="block">Allow the user to win a free meal, it have a $percentage chance to win this meal.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#LotteryFidelityCard--">LotteryFidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-9.html">Prev Letter</a></li>
+<li><a href="index-11.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-10.html" target="_top">Frames</a></li>
+<li><a href="index-10.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-11.html b/doc/index-files/index-11.html
index 4d4ba0c..cc988c9 100644
--- a/doc/index-files/index-11.html
+++ b/doc/index-files/index-11.html
@@ -1,193 +1,224 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>M-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="M-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-10.html">Prev Letter</a></li>
-<li><a href="index-12.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-11.html" target="_top">Frames</a></li>
-<li><a href="index-11.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:M">
-<!--   -->
-</a>
-<h2 class="title">M</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../Cli/Clui.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>
-<div class="block">END GENERIC GETTER AND SETTER</div>
-</dd>
-<dt><a href="../test/main.html" title="class in test"><span class="typeNameLink">main</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../test/main.html#main--">main()</a></span> - Constructor for class test.<a href="../test/main.html" title="class in test">main</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../test/main.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class test.<a href="../test/main.html" title="class in test">main</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/MainDish.html#MainDish-java.lang.String-java.lang.String-double-">MainDish(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/MainDish.html" title="class in Item">MainDish</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#MANAGER">MANAGER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.Manager.html#Manager--">Manager()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.Manager.html" title="class in provisoire">entities.Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#MANAGER">MANAGER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#MANAGER">MANAGER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>
-<div class="block">This Meal class is created by the use of a pattern given in the constructor of
- subClasses, this pattern must consist on an array, each case contain an obligatory
- typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- it can be implemented by using a subArray.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#Meal-java.lang.String-java.lang.String-">Meal(String, String)</a></span> - Constructor for class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>
-<div class="block">CONSTRUCTORS</div>
-</dd>
-<dt><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/MealFactory.html#MealFactory--">MealFactory()</a></span> - Constructor for class Item.<a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> - Class in <a href="../Offers/package-summary.html">Offers</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#MealOfTheWeek-boolean-Item.Meal-java.util.ArrayList-">MealOfTheWeek(boolean, Meal, ArrayList&lt;Observer&gt;)</a></span> - Constructor for class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/MoralUser.html" title="class in User">MoralUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#MoralUserFactory--">MoralUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a> - Class in <a href="../Core/package-summary.html">Core</a></dt>
-<dd>
-<div class="block">Heart of the project, concatenate all the fonctionalities this project
- must have.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#MyFoodora--">MyFoodora()</a></span> - Constructor for class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-10.html">Prev Letter</a></li>
-<li><a href="index-12.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-11.html" target="_top">Frames</a></li>
-<li><a href="index-11.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>M-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="M-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-10.html">Prev Letter</a></li>
+<li><a href="index-12.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-11.html" target="_top">Frames</a></li>
+<li><a href="index-11.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:M">
+<!--   -->
+</a>
+<h2 class="title">M</h2>
+<dl>
+<dt><a href="../Core/Main.html" title="class in Core"><span class="typeNameLink">Main</span></a> - Class in <a href="../Core/package-summary.html">Core</a></dt>
+<dd>
+<div class="block">Initialize the Foodora System, the Clui and the activeUserContext.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Core/Main.html#Main--">Main()</a></span> - Constructor for class Core.<a href="../Core/Main.html" title="class in Core">Main</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/Main.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class Core.<a href="../Core/Main.html" title="class in Core">Main</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/MainDish.html#MainDish-java.lang.String-java.lang.String-double-">MainDish(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/MainDish.html" title="class in Item">MainDish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#MANAGER">MANAGER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#MANAGER">MANAGER</a></span> - Static variable in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#MANAGER">MANAGER</a></span> - Static variable in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">The managers controls foodora, they are able to do anything in the system
+ Creating users, changing parameters, calculating statistics.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#Manager-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Manager(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#MANAGER">MANAGER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#MANAGER">MANAGER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#MANAGER">MANAGER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">This Meal class is created by the use of a pattern given in the constructor of
+ subClasses, this pattern must consist on an array, each case contain an obligatory
+ typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ it can be implemented by using a subArray.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#Meal-java.lang.String-java.lang.String-">Meal(String, String)</a></span> - Constructor for class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>
+<div class="block">CONSTRUCTORS</div>
+</dd>
+<dt><a href="../Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/MealFactory.html#MealFactory--">MealFactory()</a></span> - Constructor for class Item.<a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> - Class in <a href="../Offers/package-summary.html">Offers</a></dt>
+<dd>
+<div class="block">This class is attached to a unique meal for a restaurant.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#MealOfTheWeek-Item.Meal-">MealOfTheWeek(Meal)</a></span> - Constructor for class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Abstraction of non human users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">MoralUser(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/MoralUser.html" title="class in User">MoralUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/MoralUser.html#MoralUser--">MoralUser()</a></span> - Constructor for class User.<a href="../User/MoralUser.html" title="class in User">MoralUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
+<dd>
+<div class="block">Allow to create generic non human users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#MoralUserFactory--">MoralUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a> - Class in <a href="../Core/package-summary.html">Core</a></dt>
+<dd>
+<div class="block">Heart of the project, concatenate all the functionalities this project
+ must have.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#MyFoodora--">MyFoodora()</a></span> - Constructor for class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-10.html">Prev Letter</a></li>
+<li><a href="index-12.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-11.html" target="_top">Frames</a></li>
+<li><a href="index-11.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-12.html b/doc/index-files/index-12.html
index 2093e9c..2bb31e5 100644
--- a/doc/index-files/index-12.html
+++ b/doc/index-files/index-12.html
@@ -1,133 +1,135 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>N-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="N-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-11.html">Prev Letter</a></li>
-<li><a href="index-13.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-12.html" target="_top">Frames</a></li>
-<li><a href="index-12.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:N">
-<!--   -->
-</a>
-<h2 class="title">N</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#nameOf--">nameOf()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#notifyall--">notifyall()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#notifyall--">notifyall()</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-11.html">Prev Letter</a></li>
-<li><a href="index-13.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-12.html" target="_top">Frames</a></li>
-<li><a href="index-12.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>N-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="N-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-11.html">Prev Letter</a></li>
+<li><a href="index-13.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-12.html" target="_top">Frames</a></li>
+<li><a href="index-12.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:N">
+<!--   -->
+</a>
+<h2 class="title">N</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#nameOf--">nameOf()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#notifyObservers-User.Restaurant-">notifyObservers(Restaurant)</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#notifyObservers-User.Restaurant-">notifyObservers(Restaurant)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#notifyObservers-User.Restaurant-">notifyObservers(Restaurant)</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-11.html">Prev Letter</a></li>
+<li><a href="index-13.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-12.html" target="_top">Frames</a></li>
+<li><a href="index-12.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-13.html b/doc/index-files/index-13.html
index a955dda..4053574 100644
--- a/doc/index-files/index-13.html
+++ b/doc/index-files/index-13.html
@@ -1,141 +1,154 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>O-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="O-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-12.html">Prev Letter</a></li>
-<li><a href="index-14.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-13.html" target="_top">Frames</a></li>
-<li><a href="index-13.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:O">
-<!--   -->
-</a>
-<h2 class="title">O</h2>
-<dl>
-<dt><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a> - Interface in <a href="../Offers/package-summary.html">Offers</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a> - Interface in <a href="../Offers/package-summary.html">Offers</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Offers/package-summary.html">Offers</a> - package Offers</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Order/package-summary.html">Order</a> - package Order</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> - Class in <a href="../Order/package-summary.html">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#Order--">Order()</a></span> - Constructor for class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Others/package-summary.html">Others</a> - package Others</dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-12.html">Prev Letter</a></li>
-<li><a href="index-14.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-13.html" target="_top">Frames</a></li>
-<li><a href="index-13.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>O-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="O-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-12.html">Prev Letter</a></li>
+<li><a href="index-14.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-13.html" target="_top">Frames</a></li>
+<li><a href="index-13.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:O">
+<!--   -->
+</a>
+<h2 class="title">O</h2>
+<dl>
+<dt><a href="../Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a> - Interface in <a href="../Offers/package-summary.html">Offers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a> - Interface in <a href="../Offers/package-summary.html">Offers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">OffDuty</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/OffDuty.html#OffDuty--">OffDuty()</a></span> - Constructor for class Commands.<a href="../Commands/OffDuty.html" title="class in Commands">OffDuty</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Offers/package-summary.html">Offers</a> - package Offers</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">OnDuty</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/OnDuty.html#OnDuty--">OnDuty()</a></span> - Constructor for class Commands.<a href="../Commands/OnDuty.html" title="class in Commands">OnDuty</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Order/package-summary.html">Order</a> - package Order</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> - Class in <a href="../Order/package-summary.html">Order</a></dt>
+<dd>
+<div class="block">A customer have has many order he wants to, each order is attached to
+ a restaurant and have numbers of his meals and dishes added by the customer.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#Order--">Order()</a></span> - Constructor for class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#Order-java.lang.String-User.Restaurant-">Order(String, Restaurant)</a></span> - Constructor for class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Others/package-summary.html">Others</a> - package Others</dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-12.html">Prev Letter</a></li>
+<li><a href="index-14.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-13.html" target="_top">Frames</a></li>
+<li><a href="index-13.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-14.html b/doc/index-files/index-14.html
index 0a36e08..23f01d4 100644
--- a/doc/index-files/index-14.html
+++ b/doc/index-files/index-14.html
@@ -1,143 +1,149 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>P-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="P-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-13.html">Prev Letter</a></li>
-<li><a href="index-15.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-14.html" target="_top">Frames</a></li>
-<li><a href="index-14.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:P">
-<!--   -->
-</a>
-<h2 class="title">P</h2>
-<dl>
-<dt><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Period.html#Period-Others.Date-Others.Date-">Period(Date, Date)</a></span> - Constructor for class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-User.Restaurant-">placeOrder(Restaurant)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#PointFidelityCard--">PointFidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#Position-double-double-">Position(double, double)</a></span> - Constructor for class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/package-summary.html">provisoire</a> - package provisoire</dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-13.html">Prev Letter</a></li>
-<li><a href="index-15.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-14.html" target="_top">Frames</a></li>
-<li><a href="index-14.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>P-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="P-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-13.html">Prev Letter</a></li>
+<li><a href="index-15.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-14.html" target="_top">Frames</a></li>
+<li><a href="index-14.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:P">
+<!--   -->
+</a>
+<h2 class="title">P</h2>
+<dl>
+<dt><a href="../Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>
+<div class="block">period between two date representation</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/Period.html#Period-Others.Date-Others.Date-">Period(Date, Date)</a></span> - Constructor for class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-User.Restaurant-java.lang.String-java.util.ArrayList-Core.MyFoodora-">placeOrder(Restaurant, String, ArrayList&lt;String&gt;, MyFoodora)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-">placeOrder(Order, MyFoodora)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#placeOrder-Order.Order-Core.MyFoodora-Others.Date-">placeOrder(Order, MyFoodora, Date)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>
+<div class="block">Each time a customer buy a meal, he win a point, this allow reduction or free meals.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#PointFidelityCard--">PointFidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#Position-double-double-">Position(double, double)</a></span> - Constructor for class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-13.html">Prev Letter</a></li>
+<li><a href="index-15.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-14.html" target="_top">Frames</a></li>
+<li><a href="index-14.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-15.html b/doc/index-files/index-15.html
index 1bf543b..369e03d 100644
--- a/doc/index-files/index-15.html
+++ b/doc/index-files/index-15.html
@@ -1,181 +1,236 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>R-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="R-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-14.html">Prev Letter</a></li>
-<li><a href="index-16.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-15.html" target="_top">Frames</a></li>
-<li><a href="index-15.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:R">
-<!--   -->
-</a>
-<h2 class="title">R</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery(Order)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#refuseSpam--">refuseSpam()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#register-Core.MyFoodora-">register(MyFoodora)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#registerFidelityPlan-java.lang.String-">registerFidelityPlan(String)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Dish-">remove(Dish)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Meal-">remove(Meal)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish(String)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-int-">removeDish(int)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#removeDish-Item.Dish-">removeDish(Dish)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#removeDishById-int-">removeDishById(int)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal(Meal)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#removeMealById-int-">removeMealById(int)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#removeUser-T-">removeUser(T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser(User, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#removeWithID-int-long-">removeWithID(int, long)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.Restaurant.html#Restaurant--">Restaurant()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.Restaurant.html" title="class in provisoire">entities.Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-14.html">Prev Letter</a></li>
-<li><a href="index-16.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-15.html" target="_top">Frames</a></li>
-<li><a href="index-15.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>R-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="R-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-14.html">Prev Letter</a></li>
+<li><a href="index-16.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-15.html" target="_top">Frames</a></li>
+<li><a href="index-15.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:R">
+<!--   -->
+</a>
+<h2 class="title">R</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#refuseDelivery-Order.Order-">refuseDelivery(Order)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#refuseSpam--">refuseSpam()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#register-Core.MyFoodora-">register(MyFoodora)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">RegisterCourier</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterCourier.html#RegisterCourier--">RegisterCourier()</a></span> - Constructor for class Commands.<a href="../Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">RegisterCustomer</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterCustomer.html#RegisterCustomer--">RegisterCustomer()</a></span> - Constructor for class Commands.<a href="../Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#registerFidelityPlan-java.lang.String-">registerFidelityPlan(String)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">RegisterManager</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterManager.html#RegisterManager--">RegisterManager()</a></span> - Constructor for class Commands.<a href="../Commands/RegisterManager.html" title="class in Commands">RegisterManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">RegisterRestaurant</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterRestaurant.html#RegisterRestaurant--">RegisterRestaurant()</a></span> - Constructor for class Commands.<a href="../Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Dish-">remove(Dish)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#remove-Item.Meal-">remove(Meal)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-java.lang.String-">removeDish(String)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#removeDish-int-">removeDish(int)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#removeDish-Item.Dish-">removeDish(Dish)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#removeDishById-int-">removeDishById(int)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#removeMeal-Item.Meal-">removeMeal(Meal)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#removeMealById-int-">removeMealById(int)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#removeMealOfTheWeek-Core.MyFoodora-">removeMealOfTheWeek(MyFoodora)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">RemoveSpecialOffer</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RemoveSpecialOffer.html#RemoveSpecialOffer--">RemoveSpecialOffer()</a></span> - Constructor for class Commands.<a href="../Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#removeUser-T-">removeUser(T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#removeUser-User.User-Core.MyFoodora-">removeUser(User, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#removeWithID-int-long-">removeWithID(int, long)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">RenameMeal</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RenameMeal.html#RenameMeal--">RenameMeal()</a></span> - Constructor for class Commands.<a href="../Commands/RenameMeal.html" title="class in Commands">RenameMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Restaurant are able to manage themself, they may create there meals, dishes,
+ set the mealOfTheWeek or specify discount factor.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#Restaurant-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">Restaurant(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#RESTAURANT">RESTAURANT</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#returnType--">returnType()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">RunTest</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RunTest.html#RunTest--">RunTest()</a></span> - Constructor for class Commands.<a href="../Commands/RunTest.html" title="class in Commands">RunTest</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-14.html">Prev Letter</a></li>
+<li><a href="index-16.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-15.html" target="_top">Frames</a></li>
+<li><a href="index-15.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-16.html b/doc/index-files/index-16.html
index 2418337..a1003dc 100644
--- a/doc/index-files/index-16.html
+++ b/doc/index-files/index-16.html
@@ -1,235 +1,327 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>S-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="S-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-15.html">Prev Letter</a></li>
-<li><a href="index-17.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-16.html" target="_top">Frames</a></li>
-<li><a href="index-16.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:S">
-<!--   -->
-</a>
-<h2 class="title">S</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../User/User.html#setActivated-boolean-">setActivated(boolean)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser(User)</a></span> - Method in class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setAdress-Others.Adress-">setAdress(Adress)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#setAvailable--">setAvailable()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod(Date)</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy(ContextDeliveryStrategy)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy(ContextTargetProfitStrategy)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#setDay-java.lang.String-">setDay(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setDeliveryCost-double-">setDeliveryCost(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy(MyFoodora, ContextDeliveryStrategy)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod(Date)</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser(ListUser&lt;User&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier(ListUser&lt;Courier&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer(ListUser&lt;Customer&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager(ListUser&lt;Manager&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant(ListUser&lt;Restaurant&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setMail-java.lang.String-">setMail(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setMarkupPercentage-double-">setMarkupPercentage(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal(Meal)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#setMonth-java.lang.String-">setMonth(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Item.html#setName-java.lang.String-">setName(String)</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setName-java.lang.String-">setName(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#setNotAvailable--">setNotAvailable()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setpassword-java.lang.String-">setpassword(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#setPercentage-double-">setPercentage(double)</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber(long)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#setPosition-Others.Position-">setPosition(Position)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#setPrice-double-">setPrice(double)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#setPrice-double-">setPrice(double)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#setPrice-double-">setPrice(double)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard(FidelityCard, double)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setServiceFee-double-">setServiceFee(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setState-boolean-">setState(boolean)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in interface Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy(MyFoodora, ContextTargetProfitStrategy)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood(String)</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser(int)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#setUseractivated-boolean-T-">setUseractivated(boolean, T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#setUsername-java.lang.String-">setUsername(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#setX-double-">setX(double)</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#setX-double-">setX(double)</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#setY-double-">setY(double)</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#setY-double-">setY(double)</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#setYear-java.lang.String-">setYear(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Starter.html#Starter-java.lang.String-java.lang.String-double-">Starter(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Starter.html" title="class in Item">Starter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span> - Variable in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a> - Interface in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../StrategyProfit/package-summary.html">StrategyProfit</a> - package StrategyProfit</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#StrategyTargetProfitPolicy--">StrategyTargetProfitPolicy()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cli/Input.html#string-java.lang.String-">string(String)</a></span> - Static method in class Cli.<a href="../Cli/Input.html" title="class in Cli">Input</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-15.html">Prev Letter</a></li>
-<li><a href="index-17.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-16.html" target="_top">Frames</a></li>
-<li><a href="index-16.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>S-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="S-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-15.html">Prev Letter</a></li>
+<li><a href="index-17.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-16.html" target="_top">Frames</a></li>
+<li><a href="index-16.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:S">
+<!--   -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../User/User.html#setActivated-boolean-">setActivated(boolean)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#setActiveUser-User.User-">setActiveUser(User)</a></span> - Method in class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setAdress-Others.Adress-">setAdress(Adress)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#setAvailable-boolean-">setAvailable(boolean)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#setAvailable--">setAvailable()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Period.html#setBeginingOfPeriod-Others.Date-">setBeginingOfPeriod(Date)</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextDeliveryPolicy-DeliveryStrategy.ContextDeliveryStrategy-">setContextDeliveryPolicy(ContextDeliveryStrategy)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setContextTargetProfitStrategy-StrategyProfit.ContextTargetProfitStrategy-">setContextTargetProfitStrategy(ContextTargetProfitStrategy)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#setDate-Others.Date-">setDate(Date)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#setDay-java.lang.String-">setDay(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setDeliveryCost-double-">setDeliveryCost(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">SetDeliveryPolicy</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetDeliveryPolicy.html#SetDeliveryPolicy--">SetDeliveryPolicy()</a></span> - Constructor for class Commands.<a href="../Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#setDeliveryPolicy-Core.MyFoodora-DeliveryStrategy.ContextDeliveryStrategy-">setDeliveryPolicy(MyFoodora, ContextDeliveryStrategy)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Period.html#setEndOfPeriod-Others.Date-">setEndOfPeriod(Date)</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#setGeneralDiscountFactor-double-">setGeneralDiscountFactor(double)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setGlobalListUser-User.ListUser-">setGlobalListUser(ListUser&lt;User&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setInterests-User.Restaurant-">setInterests(Restaurant)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCourier-User.ListUser-">setListCourier(ListUser&lt;Courier&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListCustomer-User.ListUser-">setListCustomer(ListUser&lt;Customer&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#setListDish-java.util.ArrayList-">setListDish(ArrayList&lt;Dish&gt;)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListManager-User.ListUser-">setListManager(ListUser&lt;Manager&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#setListMeal-java.util.ArrayList-">setListMeal(ArrayList&lt;Meal&gt;)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Historique.html#setListOfOrder-java.util.ArrayList-">setListOfOrder(ArrayList&lt;Order&gt;)</a></span> - Method in class Others.<a href="../Others/Historique.html" title="class in Others">Historique</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setListRestaurant-User.ListUser-">setListRestaurant(ListUser&lt;Restaurant&gt;)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setMail-java.lang.String-">setMail(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setMarkupPercentage-double-">setMarkupPercentage(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setMeal-Item.Meal-">setMeal(Meal)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#setMealOfTheWeek-Offers.MealOfTheWeek-">setMealOfTheWeek(MealOfTheWeek)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#setMonth-java.lang.String-">setMonth(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Item.html#setName-java.lang.String-">setName(String)</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setName-java.lang.String-">setName(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#setNameOfStrategy-java.lang.String-">setNameOfStrategy(String)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#setNbOfLivraison-long-">setNbOfLivraison(long)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#setNbOfPoint-long-">setNbOfPoint(long)</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#setNbOfSell-long-">setNbOfSell(long)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#setNbOfSell-long-">setNbOfSell(long)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#setNotAvailable--">setNotAvailable()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#setObservers-java.util.ArrayList-">setObservers(ArrayList&lt;Observer&gt;)</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setObservers-java.util.ArrayList-">setObservers(ArrayList&lt;Observer&gt;)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setpassword-java.lang.String-">setpassword(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#setPercentage-double-">setPercentage(double)</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setPhoneNumber-long-">setPhoneNumber(long)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#setPosition-Others.Position-">setPosition(Position)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#setPrice-double-">setPrice(double)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#setPrice-double-">setPrice(double)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#setProbabilityOnLoteryCard-Cards.FidelityCard-double-">setProbabilityOnLoteryCard(FidelityCard, double)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">SetProfitPolicy</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetProfitPolicy.html#SetProfitPolicy--">SetProfitPolicy()</a></span> - Constructor for class Commands.<a href="../Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#setRestaurantAttached-User.Restaurant-">setRestaurantAttached(Restaurant)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#setServiceFee-double-">setServiceFee(double)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#setSpamAgree-boolean-">setSpamAgree(boolean)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#setSpecialDiscountFactor-double-">setSpecialDiscountFactor(double)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">SetSpecialOffer</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetSpecialOffer.html#SetSpecialOffer--">SetSpecialOffer()</a></span> - Constructor for class Commands.<a href="../Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#setState-boolean-">setState(boolean)</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#setState-boolean-">setState(boolean)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/ContextStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in interface Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#setStrategy-DeliveryStrategy.StrategyDeliveryPolicy-">setStrategy(StrategyDeliveryPolicy)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-java.lang.String-">setStrategy(String)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#setStrategy-StrategyProfit.StrategyTargetProfitPolicy-">setStrategy(StrategyTargetProfitPolicy)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#setTargetProfitPolicy-Core.MyFoodora-StrategyProfit.ContextTargetProfitStrategy-">setTargetProfitPolicy(MyFoodora, ContextTargetProfitStrategy)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Item.html#setTypeOfFood-java.lang.String-">setTypeOfFood(String)</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setTypeOfUser-int-">setTypeOfUser(int)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#setUseractivated-boolean-T-">setUseractivated(boolean, T)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#setUsername-java.lang.String-">setUsername(String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Token.html#setValue-java.lang.String-">setValue(String)</a></span> - Method in class Cli.<a href="../Cli/Token.html" title="class in Cli">Token</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#setX-double-">setX(double)</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#setX-double-">setX(double)</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#setY-double-">setY(double)</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#setY-double-">setY(double)</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#setYear-java.lang.String-">setYear(String)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">ShowCourier</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCourier.html#ShowCourier--">ShowCourier()</a></span> - Constructor for class Commands.<a href="../Commands/ShowCourier.html" title="class in Commands">ShowCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">ShowCourierOrdered</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCourierOrdered.html#ShowCourierOrdered--">ShowCourierOrdered()</a></span> - Constructor for class Commands.<a href="../Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">ShowCustomer</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCustomer.html#ShowCustomer--">ShowCustomer()</a></span> - Constructor for class Commands.<a href="../Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">ShowMeal</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowMeal.html#ShowMeal--">ShowMeal()</a></span> - Constructor for class Commands.<a href="../Commands/ShowMeal.html" title="class in Commands">ShowMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">ShowMenuItem</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowMenuItem.html#ShowMenuItem--">ShowMenuItem()</a></span> - Constructor for class Commands.<a href="../Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">ShowProfitBetween</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowProfitBetween.html#ShowProfitBetween--">ShowProfitBetween()</a></span> - Constructor for class Commands.<a href="../Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">ShowRestaurantTop</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowRestaurantTop.html#ShowRestaurantTop--">ShowRestaurantTop()</a></span> - Constructor for class Commands.<a href="../Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/ShowTotalProfit.html" title="class in Commands"><span class="typeNameLink">ShowTotalProfit</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowTotalProfit.html#ShowTotalProfit--">ShowTotalProfit()</a></span> - Constructor for class Commands.<a href="../Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Starter.html#Starter-java.lang.String-java.lang.String-double-">Starter(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Starter.html" title="class in Item">Starter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#strategy">strategy</a></span> - Variable in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
+<dd>
+<div class="block">Abstract Class of the strategy Delivery</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#StrategyDeliveryPolicy--">StrategyDeliveryPolicy()</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../StrategyProfit/package-summary.html">StrategyProfit</a> - package StrategyProfit</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
+<dd>
+<div class="block">Abstraction of the target profit strategy</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#StrategyTargetProfitPolicy--">StrategyTargetProfitPolicy()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Input.html#string-java.lang.String-">string(String)</a></span> - Static method in class Cli.<a href="../Cli/Input.html" title="class in Cli">Input</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-15.html">Prev Letter</a></li>
+<li><a href="index-17.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-16.html" target="_top">Frames</a></li>
+<li><a href="index-16.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-17.html b/doc/index-files/index-17.html
index a85dcdd..c23d90b 100644
--- a/doc/index-files/index-17.html
+++ b/doc/index-files/index-17.html
@@ -1,165 +1,398 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>T-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="T-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-16.html">Prev Letter</a></li>
-<li><a href="index-18.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-17.html" target="_top">Frames</a></li>
-<li><a href="index-17.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:T">
-<!--   -->
-</a>
-<h2 class="title">T</h2>
-<dl>
-<dt><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#TargetProfitDeliveryCost--">TargetProfitDeliveryCost()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#TargetProfitMarkup--">TargetProfitMarkup()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#TargetProfitServiceFee--">TargetProfitServiceFee()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../test/package-summary.html">test</a> - package test</dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cli/Confirm.html#text-java.lang.String-">text(String)</a></span> - Static method in class Cli.<a href="../Cli/Confirm.html" title="class in Cli">Confirm</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#toString--">toString()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#toString--">toString()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#toString--">toString()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#toString--">toString()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>
-<div class="block">OVERRIDE</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#toString--">toString()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#toString--">toString()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#toString--">toString()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-16.html">Prev Letter</a></li>
-<li><a href="index-18.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-17.html" target="_top">Frames</a></li>
-<li><a href="index-17.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>T-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="T-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-16.html">Prev Letter</a></li>
+<li><a href="index-18.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-17.html" target="_top">Frames</a></li>
+<li><a href="index-17.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:T">
+<!--   -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
+<dd>
+<div class="block">Strategy which focus on the delivery cost.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#TargetProfitDeliveryCost--">TargetProfitDeliveryCost()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
+<dd>
+<div class="block">Strategy which focus on the markup.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#TargetProfitMarkup--">TargetProfitMarkup()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
+<dd>
+<div class="block">Strategy focused on the service fee</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#TargetProfitServiceFee--">TargetProfitServiceFee()</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/package-summary.html">test</a> - package test</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testAcceptDelivery--">testAcceptDelivery()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testAcceptSpam--">testAcceptSpam()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testActivateUser--">testActivateUser()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#testAddDish--">testAddDish()</a></span> - Method in class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testAddDish--">testAddDish()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testAddMeal--">testAddMeal()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testAddUser--">testAddUser()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOthers.html#testAdressFromString--">testAdressFromString()</a></span> - Method in class test.<a href="../test/TestOthers.html" title="class in test">TestOthers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestCard.html" title="class in test"><span class="typeNameLink">TestCard</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#TestCard--">TestCard()</a></span> - Constructor for class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testChangeServiceFee--">testChangeServiceFee()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">TestCli</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCli.html#TestCli--">TestCli()</a></span> - Constructor for class test.<a href="../test/TestCli.html" title="class in test">TestCli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCli.html#testClui--">testClui()</a></span> - Method in class test.<a href="../test/TestCli.html" title="class in test">TestCli</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">TestCore</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#TestCore--">TestCore()</a></span> - Constructor for class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">TestCourier</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#TestCourier--">TestCourier()</a></span> - Constructor for class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#testCreateDish--">testCreateDish()</a></span> - Method in class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#testCreateFullMeal--">testCreateFullMeal()</a></span> - Method in class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#testCreateHalfMeal--">testCreateHalfMeal()</a></span> - Method in class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#testCreateHumanUser--">testCreateHumanUser()</a></span> - Method in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#testCreateMoralUser--">testCreateMoralUser()</a></span> - Method in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">TestCustomer</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#TestCustomer--">TestCustomer()</a></span> - Constructor for class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testDeliveryCost--">testDeliveryCost()</a></span> - Method in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">TestDeliveryStrategy</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#TestDeliveryStrategy--">TestDeliveryStrategy()</a></span> - Constructor for class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testDesactivateUser--">testDesactivateUser()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestException.html" title="class in test"><span class="typeNameLink">TestException</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#TestException--">TestException()</a></span> - Constructor for class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownDishType--">testExceptionUnknownDishType()</a></span> - Method in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownMealType--">testExceptionUnknownMealType()</a></span> - Method in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownStartegyDelivery--">testExceptionUnknownStartegyDelivery()</a></span> - Method in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownStartegyProfit--">testExceptionUnknownStartegyProfit()</a></span> - Method in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownTypeOfUser--">testExceptionUnknownTypeOfUser()</a></span> - Method in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#testFairOccupation--">testFairOccupation()</a></span> - Method in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#testFastestDelivery--">testFastestDelivery()</a></span> - Method in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOrder.html#testFinalize--">testFinalize()</a></span> - Method in class test.<a href="../test/TestOrder.html" title="class in test">TestOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetAverageIncomePerCustomer--">testGetAverageIncomePerCustomer()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testGetCard--">testGetCard()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#testGetLastMonthIncome--">testGetLastMonthIncome()</a></span> - Method in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#testGetLastMonthNumberOfCommands--">testGetLastMonthNumberOfCommands()</a></span> - Method in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetLeastActiveCourier--">testGetLeastActiveCourier()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetLeastSellingRestaurant--">testGetLeastSellingRestaurant()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOrder.html#testGetListOfOrderInAPeriod--">testGetListOfOrderInAPeriod()</a></span> - Method in class test.<a href="../test/TestOrder.html" title="class in test">TestOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetMostActiveCourier--">testGetMostActiveCourier()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetMostSellingRestaurant--">testGetMostSellingRestaurant()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testGetNbOfOrderOfTheDay--">testGetNbOfOrderOfTheDay()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testGetPointInTheCard--">testGetPointInTheCard()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOrder.html#testGetPrice--">testGetPrice()</a></span> - Method in class test.<a href="../test/TestOrder.html" title="class in test">TestOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#testGetReduction--">testGetReduction()</a></span> - Method in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testGetSortListOfDish--">testGetSortListOfDish()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testGetSortListOfHalfMeal--">testGetSortListOfHalfMeal()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetTotalIncome--">testGetTotalIncome()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testGetTotalProfit--">testGetTotalProfit()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#testGetUserByLogin--">testGetUserByLogin()</a></span> - Method in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#testGetUserByName--">testGetUserByName()</a></span> - Method in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#testIDCard--">testIDCard()</a></span> - Method in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOthers.html#testIDCard--">testIDCard()</a></span> - Method in class test.<a href="../test/TestOthers.html" title="class in test">TestOthers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#testInFoodora--">testInFoodora()</a></span> - Method in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">TestItem</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#TestItem--">TestItem()</a></span> - Constructor for class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">TestManager</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#TestManager--">TestManager()</a></span> - Constructor for class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testMarkupPercentage--">testMarkupPercentage()</a></span> - Method in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#testNotifyObservers--">testNotifyObservers()</a></span> - Method in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">TestOffers</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#TestOffers--">TestOffers()</a></span> - Constructor for class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">TestOrder</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOrder.html#TestOrder--">TestOrder()</a></span> - Constructor for class test.<a href="../test/TestOrder.html" title="class in test">TestOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">TestOthers</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOthers.html#TestOthers--">TestOthers()</a></span> - Constructor for class test.<a href="../test/TestOthers.html" title="class in test">TestOthers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#testPercentageInTheCard--">testPercentageInTheCard()</a></span> - Method in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testPlaceOrder--">testPlaceOrder()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#testPointInTheCard--">testPointInTheCard()</a></span> - Method in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testRefuseSpam--">testRefuseSpam()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testRegister--">testRegister()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testRegisterFidelityPlan--">testRegisterFidelityPlan()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestItem.html#testRemoveDish--">testRemoveDish()</a></span> - Method in class test.<a href="../test/TestItem.html" title="class in test">TestItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testRemoveDish--">testRemoveDish()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testRemoveMeal--">testRemoveMeal()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testRemoveUser--">testRemoveUser()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#testRemoveWithID--">testRemoveWithID()</a></span> - Method in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">TestRestaurant</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#TestRestaurant--">TestRestaurant()</a></span> - Constructor for class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testServiceFee--">testServiceFee()</a></span> - Method in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testSetAvailable--">testSetAvailable()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testSetDeliveryPolicy--">testSetDeliveryPolicy()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek()</a></span> - Method in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testSetNotAvailable--">testSetNotAvailable()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testSetPosition--">testSetPosition()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#testSetTargetProfitPolicy--">testSetTargetProfitPolicy()</a></span> - Method in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">TestTargetProfitStrategy</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#TestTargetProfitStrategy--">TestTargetProfitStrategy()</a></span> - Constructor for class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#testUnregister--">testUnregister()</a></span> - Method in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#testUnregisterFidelityPlan--">testUnregisterFidelityPlan()</a></span> - Method in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../test/TestUserFactory.html" title="class in test"><span class="typeNameLink">TestUserFactory</span></a> - Class in <a href="../test/package-summary.html">test</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#TestUserFactory--">TestUserFactory()</a></span> - Constructor for class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/Token.html" title="class in Cli"><span class="typeNameLink">Token</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>
+<div class="block">A token represent a container for an argument, each time a command is given,
+ The Clui will try to match each argument in it's associated Token.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Token.html#Token-Cli.Token.TypeToken-java.lang.String-">Token(Token.TypeToken, String)</a></span> - Constructor for class Cli.<a href="../Cli/Token.html" title="class in Cli">Token</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/Token.TypeToken.html" title="enum in Cli"><span class="typeNameLink">Token.TypeToken</span></a> - Enum in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#toString--">toString()</a></span> - Method in class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#toString--">toString()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#toString--">toString()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#toString--">toString()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#toString--">toString()</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#toString--">toString()</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#toString--">toString()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#toString--">toString()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#toString--">toString()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#toString--">toString()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>
+<div class="block">OVERRIDE</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/Historique.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Historique.html" title="class in Others">Historique</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#toString--">toString()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#toString--">toString()</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#toString--">toString()</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#toString--">toString()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#toString--">toString()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#toString--">toString()</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#toString--">toString()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#toString--">toString()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-16.html">Prev Letter</a></li>
+<li><a href="index-18.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-17.html" target="_top">Frames</a></li>
+<li><a href="index-17.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-18.html b/doc/index-files/index-18.html
index 6a14836..c3a4f07 100644
--- a/doc/index-files/index-18.html
+++ b/doc/index-files/index-18.html
@@ -1,157 +1,191 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>U-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="U-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-17.html">Prev Letter</a></li>
-<li><a href="index-19.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-18.html" target="_top">Frames</a></li>
-<li><a href="index-18.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:U">
-<!--   -->
-</a>
-<h2 class="title">U</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#unregister-Core.MyFoodora-">unregister(MyFoodora)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#unregisterFidelityPlan-java.lang.String-">unregisterFidelityPlan(String)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/Observer.html#update--">update()</a></span> - Method in interface Offers.<a href="../Offers/Observer.html" title="interface in Offers">Observer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#update--">update()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/package-summary.html">User</a> - package User</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/User.html" title="class in User"><span class="typeNameLink">User</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-<dt><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UserFactory--">UserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> - package UserFactoryPattern</dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-17.html">Prev Letter</a></li>
-<li><a href="index-19.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-18.html" target="_top">Frames</a></li>
-<li><a href="index-18.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>U-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="U-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-17.html">Prev Letter</a></li>
+<li><a href="index-19.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-18.html" target="_top">Frames</a></li>
+<li><a href="index-18.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:U">
+<!--   -->
+</a>
+<h2 class="title">U</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UNKNOWN">UNKNOWN</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#unregister-Core.MyFoodora-">unregister(MyFoodora)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#unregisterFidelityPlan--">unregisterFidelityPlan()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/Observer.html#update-java.lang.String-">update(String)</a></span> - Method in interface Offers.<a href="../Offers/Observer.html" title="interface in Offers">Observer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#update-java.lang.String-">update(String)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/package-summary.html">User</a> - package User</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/User.html" title="class in User"><span class="typeNameLink">User</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Abstraction of all the available users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#User--">User()</a></span> - Constructor for class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#User-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">User(long, String, String, String, String, Adress, boolean)</a></span> - Constructor for class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/UserFactory.html" title="class in User"><span class="typeNameLink">UserFactory</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/UserFactory.html#UserFactory--">UserFactory()</a></span> - Constructor for class User.<a href="../User/UserFactory.html" title="class in User">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
+<dd>
+<div class="block">Factory to create factory of abstracted user.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#UserFactory--">UserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a> - package UserFactoryPattern</dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-17.html">Prev Letter</a></li>
+<li><a href="index-19.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-18.html" target="_top">Frames</a></li>
+<li><a href="index-18.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-19.html b/doc/index-files/index-19.html
index a24cf2a..cd985a4 100644
--- a/doc/index-files/index-19.html
+++ b/doc/index-files/index-19.html
@@ -1,145 +1,154 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>V-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="V-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-18.html">Prev Letter</a></li>
-<li>Next Letter</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-19.html" target="_top">Frames</a></li>
-<li><a href="index-19.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:V">
-<!--   -->
-</a>
-<h2 class="title">V</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.VisitableCard-">visit(VisitableCard)</a></span> - Method in interface Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.VisitableCard-">visit(VisitableCard)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a> - Interface in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a> - Interface in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a> - Interface in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a> - Interface in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#visitPrice-Item.VisitablePrice-">visitPrice(VisitablePrice)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice(VisitablePrice)</a></span> - Method in interface Item.<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#visitPrice-Item.VisitablePrice-">visitPrice(VisitablePrice)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-18.html">Prev Letter</a></li>
-<li>Next Letter</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-19.html" target="_top">Frames</a></li>
-<li><a href="index-19.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>V-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="V-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-18.html">Prev Letter</a></li>
+<li>Next Letter</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-19.html" target="_top">Frames</a></li>
+<li><a href="index-19.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:V">
+<!--   -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum Cli.<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Token.TypeToken.html#values--">values()</a></span> - Static method in enum Cli.<a href="../Cli/Token.TypeToken.html" title="enum in Cli">Token.TypeToken</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.PointFidelityCard-">visit(PointFidelityCard)</a></span> - Method in interface Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/VisiterCard.html#visit-Cards.LotteryFidelityCard-">visit(LotteryFidelityCard)</a></span> - Method in interface Cards.<a href="../Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.LotteryFidelityCard-">visit(LotteryFidelityCard)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#visit-Cards.PointFidelityCard-">visit(PointFidelityCard)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a> - Interface in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a> - Interface in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a> - Interface in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a> - Interface in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/VisitorPrice.html#visitPrice-Item.VisitablePrice-">visitPrice(VisitablePrice)</a></span> - Method in interface Item.<a href="../Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-18.html">Prev Letter</a></li>
+<li>Next Letter</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-19.html" target="_top">Frames</a></li>
+<li><a href="index-19.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-2.html b/doc/index-files/index-2.html
index 7be7e62..2f27dab 100644
--- a/doc/index-files/index-2.html
+++ b/doc/index-files/index-2.html
@@ -1,131 +1,139 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>B-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="B-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-1.html">Prev Letter</a></li>
-<li><a href="index-3.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-2.html" target="_top">Frames</a></li>
-<li><a href="index-2.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:B">
-<!--   -->
-</a>
-<h2 class="title">B</h2>
-<dl>
-<dt><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#BasicFidelityCard--">BasicFidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-1.html">Prev Letter</a></li>
-<li><a href="index-3.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-2.html" target="_top">Frames</a></li>
-<li><a href="index-2.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>B-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="B-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-1.html">Prev Letter</a></li>
+<li><a href="index-3.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-2.html" target="_top">Frames</a></li>
+<li><a href="index-2.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:B">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><a href="../Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>
+<div class="block">Basic Card, by default attached to the client, no point, no lottery.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cards/BasicFidelityCard.html#BasicFidelityCard--">BasicFidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/BasicFidelityCard.html" title="class in Cards">BasicFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Offers/BirthdayOffer.html" title="class in Offers"><span class="typeNameLink">BirthdayOffer</span></a> - Class in <a href="../Offers/package-summary.html">Offers</a></dt>
+<dd>
+<div class="block">Gives a promotion when it's the customer's birthday</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#BirthdayOffer-boolean-java.util.ArrayList-">BirthdayOffer(boolean, ArrayList&lt;Observer&gt;)</a></span> - Constructor for class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-1.html">Prev Letter</a></li>
+<li><a href="index-3.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-2.html" target="_top">Frames</a></li>
+<li><a href="index-2.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-3.html b/doc/index-files/index-3.html
index aaf823c..88ac1da 100644
--- a/doc/index-files/index-3.html
+++ b/doc/index-files/index-3.html
@@ -1,231 +1,308 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>C-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="C-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-2.html">Prev Letter</a></li>
-<li><a href="index-4.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-3.html" target="_top">Frames</a></li>
-<li><a href="index-3.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:C">
-<!--   -->
-</a>
-<h2 class="title">C</h2>
-<dl>
-<dt><a href="../Cards/package-summary.html">Cards</a> - package Cards</dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier(ArrayList&lt;Courier&gt;)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#chooseCourier-java.util.ArrayList-">chooseCourier(ArrayList&lt;Courier&gt;)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-java.util.ArrayList-">chooseCourier(ArrayList&lt;Courier&gt;)</a></span> - Method in interface DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cli/package-summary.html">Cli</a> - package Cli</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cli/Clui.html#Clui--">Clui()</a></span> - Constructor for class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#compareTo-Order.Order-">compareTo(Order)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#compareTo-User.User-">compareTo(User)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>
-<div class="block">OVERRIDE</div>
-</dd>
-<dt><a href="../Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Confirm</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cli/Confirm.html#Confirm--">Confirm()</a></span> - Constructor for class Cli.<a href="../Cli/Confirm.html" title="class in Cli">Confirm</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.ContextDeliveryPolicy.html#ContextDeliveryPolicy--">ContextDeliveryPolicy()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">entities.ContextDeliveryPolicy</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy(String)</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a> - Interface in <a href="../Core/package-summary.html">Core</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.ContextTargetProfit.html#ContextTargetProfit--">ContextTargetProfit()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">entities.ContextTargetProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy(String)</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Core/package-summary.html">Core</a> - package Core</dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#COURIER">COURIER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.Courier.html#Courier--">Courier()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.Courier.html" title="class in provisoire">entities.Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#COURIER">COURIER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#COURIER">COURIER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish(String, String, String, double)</a></span> - Method in class Item.<a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/FactoryMeal.html#createMeal-java.lang.String-">createMeal(String)</a></span> - Method in class Item.<a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal(String, String, String)</a></span> - Method in class Item.<a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory(String)</a></span> - Static method in class UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.Customer.html#Customer--">Customer()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.Customer.html" title="class in provisoire">entities.Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-boolean-">Customer(long, String, String, String, String, Adress, boolean, String, String, boolean)</a></span> - Constructor for class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-2.html">Prev Letter</a></li>
-<li><a href="index-4.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-3.html" target="_top">Frames</a></li>
-<li><a href="index-3.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>C-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="C-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-2.html">Prev Letter</a></li>
+<li><a href="index-4.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-3.html" target="_top">Frames</a></li>
+<li><a href="index-3.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:C">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><a href="../Cards/package-summary.html">Cards</a> - package Cards</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#changeDeliveryCost-double-Core.MyFoodora-">changeDeliveryCost(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#changeMarkupPercentage-double-Core.MyFoodora-">changeMarkupPercentage(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#changeServiceFee-double-Core.MyFoodora-">changeServiceFee(double, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#checkForPendingOffer--">checkForPendingOffer()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier(Restaurant, Customer, ArrayList&lt;Courier&gt;)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier(Restaurant, Customer, ArrayList&lt;Courier&gt;)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#chooseCourier-User.Restaurant-User.Customer-java.util.ArrayList-">chooseCourier(Restaurant, Customer, ArrayList&lt;Courier&gt;)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitDeliveryCost.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit">TargetProfitDeliveryCost</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitMarkup.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit">TargetProfitMarkup</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/TargetProfitServiceFee.html#chooseTargetProfit-Core.MyFoodora-double-">chooseTargetProfit(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit">TargetProfitServiceFee</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/package-summary.html">Cli</a> - package Cli</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>
+<div class="block">Clui controller, create a context allowing cli into foodora system.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Clui.html#Clui-Core.MyFoodora-Core.ActiveUserContext-">Clui(MyFoodora, ActiveUserContext)</a></span> - Constructor for class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/Command.html" title="class in Cli"><span class="typeNameLink">Command</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>
+<div class="block">Describes how all command are, composed by a commandName and a listOfArgs,
+ It allow to verify if each argument is correct, and if all arguments are there.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Command.html#Command-java.lang.String-Cli.Token:A-">Command(String, Token[])</a></span> - Constructor for class Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/package-summary.html">Commands</a> - package Commands</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#compareTo-Order.Order-">compareTo(Order)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#compareTo-Others.Date-">compareTo(Date)</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#compareTo-User.User-">compareTo(User)</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#compareTo-User.User-">compareTo(User)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>
+<div class="block">OVERRIDE</div>
+</dd>
+<dt><a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
+<dd>
+<div class="block">Create a context outside foodora to manager and execute strategyDelivery</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#ContextDeliveryStrategy-java.lang.String-">ContextDeliveryStrategy(String)</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a> - Interface in <a href="../Core/package-summary.html">Core</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a> - Class in <a href="../StrategyProfit/package-summary.html">StrategyProfit</a></dt>
+<dd>
+<div class="block">Context of the profit strategy.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#ContextTargetProfitStrategy-java.lang.String-">ContextTargetProfitStrategy(String)</a></span> - Constructor for class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Core/package-summary.html">Core</a> - package Core</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#COURIER">COURIER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#COURIER">COURIER</a></span> - Static variable in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">The Courier deliver the order from the restaurant to the customer.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#Courier-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Courier(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#Courier--">Courier()</a></span> - Constructor for class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#COURIER">COURIER</a></span> - Static variable in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#COURIER">COURIER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#COURIER">COURIER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#COURIER">COURIER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/FactoryDish.html#createDish-java.lang.String-java.lang.String-java.lang.String-double-">createDish(String, String, String, double)</a></span> - Method in class Item.<a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createHumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-int-">createHumanUser(long, String, String, String, String, Adress, boolean, String, String, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">CreateMeal</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/CreateMeal.html#CreateMeal--">CreateMeal()</a></span> - Constructor for class Commands.<a href="../Commands/CreateMeal.html" title="class in Commands">CreateMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/FactoryMeal.html#createMeal-java.lang.String-java.lang.String-">createMeal(String, String)</a></span> - Method in class Item.<a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/MealFactory.html#createMeal-java.lang.String-java.lang.String-java.lang.String-">createMeal(String, String, String)</a></span> - Method in class Item.<a href="../Item/MealFactory.html" title="class in Item">MealFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#createMeal-java.lang.String-java.lang.String-">createMeal(String, String)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/MoralUserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern">MoralUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#createMoralUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-int-">createMoralUser(long, String, String, String, String, Adress, boolean, int)</a></span> - Method in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">CreateOrder</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/CreateOrder.html#CreateOrder--">CreateOrder()</a></span> - Constructor for class Commands.<a href="../Commands/CreateOrder.html" title="class in Commands">CreateOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#createOrder-java.lang.String-User.Restaurant-">createOrder(String, Restaurant)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/UserFactory.html#createUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-">createUser(long, String, String, String, String, Adress, boolean)</a></span> - Method in class User.<a href="../User/UserFactory.html" title="class in User">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#createUserFactory-java.lang.String-">createUserFactory(String)</a></span> - Static method in class UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCard.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestCard.html" title="class in test">TestCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCore.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestCore.html" title="class in test">TestCore</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCourier.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestCourier.html" title="class in test">TestCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCustomer.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestException.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestException.html" title="class in test">TestException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestManager.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestManager.html" title="class in test">TestManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestOffers.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestOffers.html" title="class in test">TestOffers</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestRestaurant.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestUserFactory.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class test.<a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#Customer-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">Customer(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/UserFactory.html#CUSTOMER">CUSTOMER</a></span> - Static variable in class UserFactoryPattern.<a href="../UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern">UserFactory</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-2.html">Prev Letter</a></li>
+<li><a href="index-4.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-3.html" target="_top">Frames</a></li>
+<li><a href="index-3.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-4.html b/doc/index-files/index-4.html
index cc63aa3..1f67977 100644
--- a/doc/index-files/index-4.html
+++ b/doc/index-files/index-4.html
@@ -1,153 +1,160 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>D-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="D-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-3.html">Prev Letter</a></li>
-<li><a href="index-5.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-4.html" target="_top">Frames</a></li>
-<li><a href="index-4.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:D">
-<!--   -->
-</a>
-<h2 class="title">D</h2>
-<dl>
-<dt><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#Date-java.lang.String-java.lang.String-java.lang.String-">Date(String, String, String)</a></span> - Constructor for class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#Date-int-int-int-">Date(int, int, int)</a></span> - Constructor for class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> - package DeliveryStrategy</dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser(MyFoodora, User)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dessert.html#Dessert-java.lang.String-java.lang.String-double-">Dessert(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Dessert.html" title="class in Item">Dessert</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver(Observer)</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#Dish-java.lang.String-java.lang.String-double-">Dish(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>
-<div class="block">CONSTURCTOR</div>
-</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-3.html">Prev Letter</a></li>
-<li><a href="index-5.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-4.html" target="_top">Frames</a></li>
-<li><a href="index-4.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>D-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="D-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-3.html">Prev Letter</a></li>
+<li><a href="index-5.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-4.html" target="_top">Frames</a></li>
+<li><a href="index-4.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:D">
+<!--   -->
+</a>
+<h2 class="title">D</h2>
+<dl>
+<dt><a href="../Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>
+<div class="block">Personal representation of an date.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#Date-java.lang.String-java.lang.String-java.lang.String-">Date(String, String, String)</a></span> - Constructor for class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#Date-int-int-int-">Date(int, int, int)</a></span> - Constructor for class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a> - package DeliveryStrategy</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#desactivateUser-Core.MyFoodora-User.User-">desactivateUser(MyFoodora, User)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dessert.html#Dessert-java.lang.String-java.lang.String-double-">Dessert(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Dessert.html" title="class in Item">Dessert</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#detachObserver-Offers.Observer-">detachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#detachObserver-Offers.Observer-">detachObserver(Observer)</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/ObservableOffer.html#detachObserver-Offers.Observer-">detachObserver(Observer)</a></span> - Method in interface Offers.<a href="../Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">Dish are basic item, they are mixed to create meal but Customers
+ are able to chose them.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#Dish-java.lang.String-java.lang.String-double-">Dish(String, String, double)</a></span> - Constructor for class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>
+<div class="block">CONSTURCTOR</div>
+</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-3.html">Prev Letter</a></li>
+<li><a href="index-5.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-4.html" target="_top">Frames</a></li>
+<li><a href="index-4.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-5.html b/doc/index-files/index-5.html
index f2be06c..3124cd4 100644
--- a/doc/index-files/index-5.html
+++ b/doc/index-files/index-5.html
@@ -1,197 +1,305 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>E-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="E-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-4.html">Prev Letter</a></li>
-<li><a href="index-6.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-5.html" target="_top">Frames</a></li>
-<li><a href="index-5.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:E">
-<!--   -->
-</a>
-<h2 class="title">E</h2>
-<dl>
-<dt><a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">entities</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../provisoire/entities.html#entities--">entities()</a></span> - Constructor for class provisoire.<a href="../provisoire/entities.html" title="class in provisoire">entities</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">entities.ContextDeliveryPolicy</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">entities.ContextTargetProfit</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">entities.Courier</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">entities.Customer</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">entities.Manager</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">entities.Restaurant</span></a> - Class in <a href="../provisoire/package-summary.html">provisoire</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>
-<div class="block">OVERRIDE</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>
-<div class="block">OVERRIDE</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Exception/package-summary.html">Exception</a> - package Exception</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType--">ExceptionUnknownDishType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-">ExceptionUnknownDishType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.Throwable-">ExceptionUnknownDishType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">ExceptionUnknownDishType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownDishType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType--">ExceptionUnknownMealType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-">ExceptionUnknownMealType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.Throwable-">ExceptionUnknownMealType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">ExceptionUnknownMealType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownMealType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType--">ExceptionUnknownStartegyType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-">ExceptionUnknownStartegyType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.Throwable-">ExceptionUnknownStartegyType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">ExceptionUnknownStartegyType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownStartegyType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/ContextStrategy.html#execute-Core.MyFoodora-double-">execute(MyFoodora, double)</a></span> - Method in interface Core.<a href="../Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#execute-Core.MyFoodora-double-">execute(MyFoodora, double)</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-4.html">Prev Letter</a></li>
-<li><a href="index-6.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-5.html" target="_top">Frames</a></li>
-<li><a href="index-5.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>E-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="E-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-4.html">Prev Letter</a></li>
+<li><a href="index-6.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-5.html" target="_top">Frames</a></li>
+<li><a href="index-5.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:E">
+<!--   -->
+</a>
+<h2 class="title">E</h2>
+<dl>
+<dt><a href="../Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">EndOrder</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/EndOrder.html#EndOrder--">EndOrder()</a></span> - Constructor for class Commands.<a href="../Commands/EndOrder.html" title="class in Commands">EndOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">EndOrderAt</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/EndOrderAt.html#EndOrderAt--">EndOrderAt()</a></span> - Constructor for class Commands.<a href="../Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>
+<div class="block">OVERRIDE</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>
+<div class="block">OVERRIDE</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">errorWrongFormatValue</span></a> - Exception in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue--">errorWrongFormatValue()</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-">errorWrongFormatValue(String)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.Throwable-">errorWrongFormatValue(Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-java.lang.Throwable-">errorWrongFormatValue(String, Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongFormatValue.html#errorWrongFormatValue-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongFormatValue(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongFormatValue.html" title="class in Cli">errorWrongFormatValue</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">errorWrongNumberOfParams</span></a> - Exception in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams--">errorWrongNumberOfParams()</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-">errorWrongNumberOfParams(String)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.Throwable-">errorWrongNumberOfParams(Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-">errorWrongNumberOfParams(String, Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongNumberOfParams.html#errorWrongNumberOfParams-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongNumberOfParams(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongNumberOfParams.html" title="class in Cli">errorWrongNumberOfParams</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">errorWrongTypeOfUser</span></a> - Exception in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser--">errorWrongTypeOfUser()</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-">errorWrongTypeOfUser(String)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.Throwable-">errorWrongTypeOfUser(Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-">errorWrongTypeOfUser(String, Throwable)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/errorWrongTypeOfUser.html#errorWrongTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">errorWrongTypeOfUser(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Cli.<a href="../Cli/errorWrongTypeOfUser.html" title="class in Cli">errorWrongTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Exception/package-summary.html">Exception</a> - package Exception</dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../test/TestCli.html#exception">exception</a></span> - Variable in class test.<a href="../test/TestCli.html" title="class in test">TestCli</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType--">ExceptionUnknownDishType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-">ExceptionUnknownDishType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.Throwable-">ExceptionUnknownDishType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-">ExceptionUnknownDishType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownDishType.html#ExceptionUnknownDishType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownDishType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType--">ExceptionUnknownMealType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-">ExceptionUnknownMealType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.Throwable-">ExceptionUnknownMealType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-">ExceptionUnknownMealType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownMealType.html#ExceptionUnknownMealType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownMealType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType--">ExceptionUnknownStartegyType()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-">ExceptionUnknownStartegyType(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.Throwable-">ExceptionUnknownStartegyType(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-">ExceptionUnknownStartegyType(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownStartegyType.html#ExceptionUnknownStartegyType-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownStartegyType(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownTypeOfUser</span></a> - Exception in <a href="../Exception/package-summary.html">Exception</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser--">ExceptionUnknownTypeOfUser()</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-">ExceptionUnknownTypeOfUser(String)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.Throwable-">ExceptionUnknownTypeOfUser(Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-">ExceptionUnknownTypeOfUser(String, Throwable)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Exception/ExceptionUnknownTypeOfUser.html#ExceptionUnknownTypeOfUser-java.lang.String-java.lang.Throwable-boolean-boolean-">ExceptionUnknownTypeOfUser(String, Throwable, boolean, boolean)</a></span> - Constructor for exception Exception.<a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Command.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddDishRestaurantMenu.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/AddDishRestaurantMenu.html" title="class in Commands">AddDishRestaurantMenu</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddDishToMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/AddDishToMeal.html" title="class in Commands">AddDishToMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AddItemToOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/AddItemToOrder.html" title="class in Commands">AddItemToOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/AssociateCard.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/AssociateCard.html" title="class in Commands">AssociateCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/CreateMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/CreateMeal.html" title="class in Commands">CreateMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/CreateOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/CreateOrder.html" title="class in Commands">CreateOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/EndOrder.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/EndOrder.html" title="class in Commands">EndOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/EndOrderAt.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/EndOrderAt.html" title="class in Commands">EndOrderAt</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/FindDeliverer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Help.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/Help.html" title="class in Commands">Help</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Login.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/Login.html" title="class in Commands">Login</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Logout.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/Logout.html" title="class in Commands">Logout</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/OffDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/OffDuty.html" title="class in Commands">OffDuty</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/OnDuty.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/OnDuty.html" title="class in Commands">OnDuty</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RegisterCourier.html" title="class in Commands">RegisterCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RegisterCustomer.html" title="class in Commands">RegisterCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterManager.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RegisterManager.html" title="class in Commands">RegisterManager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RegisterRestaurant.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RegisterRestaurant.html" title="class in Commands">RegisterRestaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RemoveSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RemoveSpecialOffer.html" title="class in Commands">RemoveSpecialOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RenameMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RenameMeal.html" title="class in Commands">RenameMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/RunTest.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/RunTest.html" title="class in Commands">RunTest</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetDeliveryPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/SetDeliveryPolicy.html" title="class in Commands">SetDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetProfitPolicy.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/SetProfitPolicy.html" title="class in Commands">SetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/SetSpecialOffer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/SetSpecialOffer.html" title="class in Commands">SetSpecialOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCourier.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowCourier.html" title="class in Commands">ShowCourier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCourierOrdered.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowCourierOrdered.html" title="class in Commands">ShowCourierOrdered</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowCustomer.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowCustomer.html" title="class in Commands">ShowCustomer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowMeal.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowMeal.html" title="class in Commands">ShowMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowMenuItem.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowMenuItem.html" title="class in Commands">ShowMenuItem</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowProfitBetween.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowProfitBetween.html" title="class in Commands">ShowProfitBetween</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowRestaurantTop.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowRestaurantTop.html" title="class in Commands">ShowRestaurantTop</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/ShowTotalProfit.html#execute-java.util.ArrayList-Core.MyFoodora-Core.ActiveUserContext-">execute(ArrayList&lt;String&gt;, MyFoodora, ActiveUserContext)</a></span> - Method in class Commands.<a href="../Commands/ShowTotalProfit.html" title="class in Commands">ShowTotalProfit</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#execute-Core.MyFoodora-double-">execute(MyFoodora, double)</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Clui.html#executeCommand-java.lang.String-">executeCommand(String)</a></span> - Method in class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#executeTargetProfitPolicy-Core.MyFoodora-double-">executeTargetProfitPolicy(MyFoodora, double)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-4.html">Prev Letter</a></li>
+<li><a href="index-6.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-5.html" target="_top">Frames</a></li>
+<li><a href="index-5.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-6.html b/doc/index-files/index-6.html
index 719474b..e56fd7f 100644
--- a/doc/index-files/index-6.html
+++ b/doc/index-files/index-6.html
@@ -1,159 +1,184 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>F-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="F-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-5.html">Prev Letter</a></li>
-<li><a href="index-7.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-6.html" target="_top">Frames</a></li>
-<li><a href="index-6.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:F">
-<!--   -->
-</a>
-<h2 class="title">F</h2>
-<dl>
-<dt><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/FactoryDish.html#FactoryDish--">FactoryDish()</a></span> - Constructor for class Item.<a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/FactoryMeal.html#FactoryMeal--">FactoryMeal()</a></span> - Constructor for class Item.<a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#FactoryUserFactory--">FactoryUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#FairOccupationDelivery--">FairOccupationDelivery()</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#FastestDelivery--">FastestDelivery()</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#FidelityCard--">FidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#finalize--">finalize()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>
-<div class="block">CUSTOM</div>
-</dd>
-<dt><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/FullMeal.html#FullMeal-java.lang.String-java.lang.String-">FullMeal(String, String)</a></span> - Constructor for class Item.<a href="../Item/FullMeal.html" title="class in Item">FullMeal</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-5.html">Prev Letter</a></li>
-<li><a href="index-7.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-6.html" target="_top">Frames</a></li>
-<li><a href="index-6.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>F-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="F-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-5.html">Prev Letter</a></li>
+<li><a href="index-7.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-6.html" target="_top">Frames</a></li>
+<li><a href="index-6.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:F">
+<!--   -->
+</a>
+<h2 class="title">F</h2>
+<dl>
+<dt><a href="../Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">This factory allow us to create generic type of food as we want to,
+ it's then easy to add a Drink category if we want to.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/FactoryDish.html#FactoryDish--">FactoryDish()</a></span> - Constructor for class Item.<a href="../Item/FactoryDish.html" title="class in Item">FactoryDish</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">This Factory allow Restaurant to create generic Meals.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/FactoryMeal.html#FactoryMeal--">FactoryMeal()</a></span> - Constructor for class Item.<a href="../Item/FactoryMeal.html" title="class in Item">FactoryMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
+<dd>
+<div class="block">Context to use user factories.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/FactoryUserFactory.html#FactoryUserFactory--">FactoryUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern">FactoryUserFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
+<dd>
+<div class="block">Tend to give equally orders to all Couriers.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FairOccupationDelivery.html#FairOccupationDelivery--">FairOccupationDelivery()</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy">FairOccupationDelivery</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a> - Class in <a href="../DeliveryStrategy/package-summary.html">DeliveryStrategy</a></dt>
+<dd>
+<div class="block">Will give the order to the nearest courier.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/FastestDelivery.html#FastestDelivery--">FastestDelivery()</a></span> - Constructor for class DeliveryStrategy.<a href="../DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy">FastestDelivery</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> - Class in <a href="../Cards/package-summary.html">Cards</a></dt>
+<dd>
+<div class="block">FidelityCard abstract class.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#FidelityCard--">FidelityCard()</a></span> - Constructor for class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#finalize--">finalize()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>
+<div class="block">CUSTOM</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#finalize-Core.MyFoodora-">finalize(MyFoodora)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#finalize-Core.MyFoodora-Others.Date-">finalize(MyFoodora, Date)</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">FindDeliverer</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/FindDeliverer.html#FindDeliverer--">FindDeliverer()</a></span> - Constructor for class Commands.<a href="../Commands/FindDeliverer.html" title="class in Commands">FindDeliverer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#fromStr-java.lang.String-">fromStr(String)</a></span> - Static method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">Type of full meal containing starter, mainDish and dessert.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/FullMeal.html#FullMeal-java.lang.String-java.lang.String-">FullMeal(String, String)</a></span> - Constructor for class Item.<a href="../Item/FullMeal.html" title="class in Item">FullMeal</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-5.html">Prev Letter</a></li>
+<li><a href="index-7.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-6.html" target="_top">Frames</a></li>
+<li><a href="index-6.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-7.html b/doc/index-files/index-7.html
index 8312a49..28cf4c1 100644
--- a/doc/index-files/index-7.html
+++ b/doc/index-files/index-7.html
@@ -1,291 +1,367 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>G-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="G-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-6.html">Prev Letter</a></li>
-<li><a href="index-8.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-7.html" target="_top">Frames</a></li>
-<li><a href="index-7.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:G">
-<!--   -->
-</a>
-<h2 class="title">G</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="../User/User.html#getAdress--">getAdress()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer(MyFoodora, Period)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod()</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#getCard--">getCard()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#getDate--">getDate()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getDay--">getDay()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getDeliveryCost--">getDeliveryCost()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Period.html#getEndOfPeriod--">getEndOfPeriod()</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getHistoricOrder--">getHistoricOrder()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#getHistorique--">getHistorique()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#getId--">getId()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getId--">getId()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>
-<div class="block">GETTER & SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Others/IDCard.html#getInstance--">getInstance()</a></span> - Static method in class Others.<a href="../Others/IDCard.html" title="class in Others">IDCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/IDUser.html#getInstance--">getInstance()</a></span> - Static method in class User.<a href="../User/IDUser.html" title="class in User">IDUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntDay--">getIntDay()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntMonth--">getIntMonth()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntYear--">getIntYear()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getLastMonthIncome--">getLastMonthIncome()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#getList--">getList()</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>
-<div class="block">GETTER & SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourier--">getListCourier()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCustomer--">getListCustomer()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#getListDish--">getListDish()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListManager--">getListManager()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfDish--">getListOfDish()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfMeal--">getListOfMeal()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod(HistoricOrder, Period)</a></span> - Static method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getListOrder--">getListOrder()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListRestaurant--">getListRestaurant()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getMail--">getMail()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getMarkupPercentage--">getMarkupPercentage()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getMeal--">getMeal()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getMonth--">getMonth()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Item.html#getName--">getName()</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getName--">getName()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy()</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#getNbOfLivraison--">getNbOfLivraison()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/IDCard.html#getNextSerialNumber--">getNextSerialNumber()</a></span> - Method in class Others.<a href="../Others/IDCard.html" title="class in Others">IDCard</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/IDUser.html#getNextSerialNumber--">getNextSerialNumber()</a></span> - Method in class User.<a href="../User/IDUser.html" title="class in User">IDUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getNumberOfOrder--">getNumberOfOrder()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getOrdered--">getOrdered()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getPhoneNumber--">getPhoneNumber()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Customer.html#getPointInTheCard--">getPointInTheCard()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Courier.html#getPosition--">getPosition()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#getPrice--">getPrice()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#getPrice--">getPrice()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#getPrice--">getPrice()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getServiceFee--">getServiceFee()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>
-<div class="block">GENERIC GETTER AND SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getTotalIncome--">getTotalIncome()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>
-<div class="block">CUSTOM GETTER AND SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome(Period, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit(Period, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
-<dd>
-<div class="block">GETTER AND SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood()</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
-<dd>
-<div class="block">GETTER & SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
-<dd>
-<div class="block">GETTER AND SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getTypeOfUser--">getTypeOfUser()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#getUser--">getUser()</a></span> - Method in class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin(String, String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
-<dd>
-<div class="block">CUSTOM</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin(String, String)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>
-<div class="block">CUSTOM</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#getUsername--">getUsername()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#getX--">getX()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#getX--">getX()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Adress.html#getY--">getY()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Position.html#getY--">getY()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Others/Date.html#getYear--">getYear()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
-<dd>
-<div class="block">GETTER & SETTER</div>
-</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-6.html">Prev Letter</a></li>
-<li><a href="index-8.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-7.html" target="_top">Frames</a></li>
-<li><a href="index-7.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>G-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="G-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-6.html">Prev Letter</a></li>
+<li><a href="index-8.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-7.html" target="_top">Frames</a></li>
+<li><a href="index-7.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:G">
+<!--   -->
+</a>
+<h2 class="title">G</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../User/User.html#getAdress--">getAdress()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getAverageIncomePerCustomer-Core.MyFoodora-Others.Period-">getAverageIncomePerCustomer(MyFoodora, Period)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Period.html#getBeginingOfPeriod--">getBeginingOfPeriod()</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getCard--">getCard()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Clui.html#getCommand-java.lang.String-">getCommand(String)</a></span> - Method in class Cli.<a href="../Cli/Clui.html" title="class in Cli">Clui</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextDeliveryPolicy--">getContextDeliveryPolicy()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getContextTargetProfitStrategy--">getContextTargetProfitStrategy()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getCustomerByOrder-Order.Order-">getCustomerByOrder(Order)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getDate--">getDate()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getDay--">getDay()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getDeliveryCost--">getDeliveryCost()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getDishByName-java.lang.String-">getDishByName(String)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Period.html#getEndOfPeriod--">getEndOfPeriod()</a></span> - Method in class Others.<a href="../Others/Period.html" title="class in Others">Period</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getGeneralDiscountFactor--">getGeneralDiscountFactor()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalHistoric--">getGlobalHistoric()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalListUser--">getGlobalListUser()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getGlobalProfit--">getGlobalProfit()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getHistoricOrder--">getHistoricOrder()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getHistorique--">getHistorique()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/FidelityCard.html#getId--">getId()</a></span> - Method in class Cards.<a href="../Cards/FidelityCard.html" title="class in Cards">FidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getId--">getId()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>
+<div class="block">GETTER & SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Others/IDCard.html#getInstance--">getInstance()</a></span> - Static method in class Others.<a href="../Others/IDCard.html" title="class in Others">IDCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/IDUser.html#getInstance--">getInstance()</a></span> - Static method in class User.<a href="../User/IDUser.html" title="class in User">IDUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntDay--">getIntDay()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntMonth--">getIntMonth()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getIntYear--">getIntYear()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getItemByName-java.lang.String-">getItemByName(String)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getLastMonthIncome--">getLastMonthIncome()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getLeastActiveCourier-Core.MyFoodora-">getLeastActiveCourier(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getLeastSellingRestaurant-Core.MyFoodora-">getLeastSellingRestaurant(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#getList--">getList()</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>
+<div class="block">GETTER & SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourier--">getListCourier()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCourierOrdered-java.lang.String-">getListCourierOrdered(String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListCustomer--">getListCustomer()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#getListDish--">getListDish()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getListDish--">getListDish()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListManager--">getListManager()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getListMeal--">getListMeal()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfDish--">getListOfDish()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getListOfMeal--">getListOfMeal()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Historique.html#getListOfOrder--">getListOfOrder()</a></span> - Method in class Others.<a href="../Others/Historique.html" title="class in Others">Historique</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getListOfOrderInAPeriod-Order.HistoricOrder-Others.Period-">getListOfOrderInAPeriod(HistoricOrder, Period)</a></span> - Static method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getListOrder--">getListOrder()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getListOrder--">getListOrder()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getListRestaurant--">getListRestaurant()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getMail--">getMail()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getMarkupPercentage--">getMarkupPercentage()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getMeal--">getMeal()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getMealByName-java.lang.String-">getMealByName(String)</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getMealOfTheWeek--">getMealOfTheWeek()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getMonth--">getMonth()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getMostActiveCourier-Core.MyFoodora-">getMostActiveCourier(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getMostSellingRestaurant-Core.MyFoodora-">getMostSellingRestaurant(MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Item.html#getName--">getName()</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getName--">getName()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/StrategyDeliveryPolicy.html#getNameOfStrategy--">getNameOfStrategy()</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy">StrategyDeliveryPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/StrategyTargetProfitPolicy.html#getNameOfStrategy--">getNameOfStrategy()</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit">StrategyTargetProfitPolicy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getNameOrder--">getNameOrder()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#getNbOfLivraison--">getNbOfLivraison()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getNbOfOfferReceived--">getNbOfOfferReceived()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#getNbOfOrderOfTheDay--">getNbOfOrderOfTheDay()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/PointFidelityCard.html#getNbOfPoint--">getNbOfPoint()</a></span> - Method in class Cards.<a href="../Cards/PointFidelityCard.html" title="class in Cards">PointFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#getNbOfSell--">getNbOfSell()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#getNbOfSell--">getNbOfSell()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/IDCard.html#getNextSerialNumber--">getNextSerialNumber()</a></span> - Method in class Others.<a href="../Others/IDCard.html" title="class in Others">IDCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/IDUser.html#getNextSerialNumber--">getNextSerialNumber()</a></span> - Method in class User.<a href="../User/IDUser.html" title="class in User">IDUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getNumberOfOrderLastMonth--">getNumberOfOrderLastMonth()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#getObservers--">getObservers()</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#getObservers--">getObservers()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getOrderByName-java.lang.String-">getOrderByName(String)</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#getOrdered--">getOrdered()</a></span> - Method in class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getOrderPendingList--">getOrderPendingList()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#getPatternTypeInMeal--">getPatternTypeInMeal()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getPendingOrderByName-java.lang.String-">getPendingOrderByName(String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#getPercentage--">getPercentage()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getPercentageInTheCard--">getPercentageInTheCard()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getPhoneNumber--">getPhoneNumber()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#getPointInTheCard--">getPointInTheCard()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#getPosition--">getPosition()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#getPrice--">getPrice()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#getPrice--">getPrice()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getPrice--">getPrice()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getProfitBetween-Others.Date-Others.Date-">getProfitBetween(Date, Date)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cards/LotteryFidelityCard.html#getReduction--">getReduction()</a></span> - Method in class Cards.<a href="../Cards/LotteryFidelityCard.html" title="class in Cards">LotteryFidelityCard</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#getRestaurantAttached--">getRestaurantAttached()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getServiceFee--">getServiceFee()</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>
+<div class="block">GENERIC GETTER AND SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getSortedListOfDish-User.Restaurant-">getSortedListOfDish(Restaurant)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getSortedListOfHalfMeal-User.Restaurant-">getSortedListOfHalfMeal(Restaurant)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getSortListOfDish--">getSortListOfDish()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getSortListOfHalfMeal--">getSortListOfHalfMeal()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Restaurant.html#getSpecialDiscountFactor--">getSpecialDiscountFactor()</a></span> - Method in class User.<a href="../User/Restaurant.html" title="class in User">Restaurant</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../DeliveryStrategy/ContextDeliveryStrategy.html#getStrategy--">getStrategy()</a></span> - Method in class DeliveryStrategy.<a href="../DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy">ContextDeliveryStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../StrategyProfit/ContextTargetProfitStrategy.html#getStrategy--">getStrategy()</a></span> - Method in class StrategyProfit.<a href="../StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit">ContextTargetProfitStrategy</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getTotalIncome-Others.Period-Core.MyFoodora-">getTotalIncome(Period, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Manager.html#getTotalProfit-Others.Period-Core.MyFoodora-">getTotalProfit(Period, MyFoodora)</a></span> - Method in class User.<a href="../User/Manager.html" title="class in User">Manager</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Item/Dish.html#getTypeInMeal--">getTypeInMeal()</a></span> - Method in class Item.<a href="../Item/Dish.html" title="class in Item">Dish</a></dt>
+<dd>
+<div class="block">GETTER AND SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Item.html#getTypeOfFood--">getTypeOfFood()</a></span> - Method in class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
+<dd>
+<div class="block">GETTER & SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Meal.html#getTypeOfMeal--">getTypeOfMeal()</a></span> - Method in class Item.<a href="../Item/Meal.html" title="class in Item">Meal</a></dt>
+<dd>
+<div class="block">GETTER AND SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getTypeOfUser--">getTypeOfUser()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/ActiveUserContext.html#getUser--">getUser()</a></span> - Method in class Core.<a href="../Core/ActiveUserContext.html" title="class in Core">ActiveUserContext</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin(String, String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>
+<div class="block">CUSTOM</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#getUserByLogin-java.lang.String-java.lang.String-">getUserByLogin(String, String)</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>
+<div class="block">CUSTOM</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByName-java.lang.String-java.lang.String-">getUserByName(String, String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Core/MyFoodora.html#getUserByUsername-java.lang.String-">getUserByUsername(String)</a></span> - Method in class Core.<a href="../Core/MyFoodora.html" title="class in Core">MyFoodora</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#getUsername--">getUsername()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Token.html#getValue--">getValue()</a></span> - Method in class Cli.<a href="../Cli/Token.html" title="class in Cli">Token</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#getX--">getX()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#getX--">getX()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Adress.html#getY--">getY()</a></span> - Method in class Others.<a href="../Others/Adress.html" title="class in Others">Adress</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Position.html#getY--">getY()</a></span> - Method in class Others.<a href="../Others/Position.html" title="class in Others">Position</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Date.html#getYear--">getYear()</a></span> - Method in class Others.<a href="../Others/Date.html" title="class in Others">Date</a></dt>
+<dd>
+<div class="block">GETTER & SETTER</div>
+</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-6.html">Prev Letter</a></li>
+<li><a href="index-8.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-7.html" target="_top">Frames</a></li>
+<li><a href="index-7.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-8.html b/doc/index-files/index-8.html
index 17f2ab9..a765f12 100644
--- a/doc/index-files/index-8.html
+++ b/doc/index-files/index-8.html
@@ -1,143 +1,161 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>H-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="H-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-7.html">Prev Letter</a></li>
-<li><a href="index-9.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-8.html" target="_top">Frames</a></li>
-<li><a href="index-8.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:H">
-<!--   -->
-</a>
-<h2 class="title">H</h2>
-<dl>
-<dt><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/HalfMeal.html#HalfMeal-java.lang.String-java.lang.String-">HalfMeal(String, String)</a></span> - Constructor for class Item.<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a> - Class in <a href="../Order/package-summary.html">Order</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#HistoricOrder--">HistoricOrder()</a></span> - Constructor for class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/HumanUser.html" title="class in User">HumanUser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#HumanUserFactory--">HumanUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-7.html">Prev Letter</a></li>
-<li><a href="index-9.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-8.html" target="_top">Frames</a></li>
-<li><a href="index-8.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>H-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="H-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-7.html">Prev Letter</a></li>
+<li><a href="index-9.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-8.html" target="_top">Frames</a></li>
+<li><a href="index-8.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:H">
+<!--   -->
+</a>
+<h2 class="title">H</h2>
+<dl>
+<dt><a href="../Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">Type oh half meal contains MainDish and either starter or dessert.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/HalfMeal.html#HalfMeal-java.lang.String-java.lang.String-">HalfMeal(String, String)</a></span> - Constructor for class Item.<a href="../Item/HalfMeal.html" title="class in Item">HalfMeal</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Commands/Help.html" title="class in Commands"><span class="typeNameLink">Help</span></a> - Class in <a href="../Commands/package-summary.html">Commands</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Commands/Help.html#Help--">Help()</a></span> - Constructor for class Commands.<a href="../Commands/Help.html" title="class in Commands">Help</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a> - Class in <a href="../Order/package-summary.html">Order</a></dt>
+<dd>
+<div class="block">A generic historic of order, used by some users and foodora.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Order/HistoricOrder.html#HistoricOrder--">HistoricOrder()</a></span> - Constructor for class Order.<a href="../Order/HistoricOrder.html" title="class in Order">HistoricOrder</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Others/Historique.html" title="class in Others"><span class="typeNameLink">Historique</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Others/Historique.html#Historique-java.util.ArrayList-">Historique(ArrayList&lt;Order&gt;)</a></span> - Constructor for class Others.<a href="../Others/Historique.html" title="class in Others">Historique</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Abstraction of human users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser-long-java.lang.String-java.lang.String-java.lang.String-java.lang.String-Others.Adress-boolean-java.lang.String-java.lang.String-">HumanUser(long, String, String, String, String, Adress, boolean, String, String)</a></span> - Constructor for class User.<a href="../User/HumanUser.html" title="class in User">HumanUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/HumanUser.html#HumanUser--">HumanUser()</a></span> - Constructor for class User.<a href="../User/HumanUser.html" title="class in User">HumanUser</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a> - Class in <a href="../UserFactoryPattern/package-summary.html">UserFactoryPattern</a></dt>
+<dd>
+<div class="block">Allow to create human users.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../UserFactoryPattern/HumanUserFactory.html#HumanUserFactory--">HumanUserFactory()</a></span> - Constructor for class UserFactoryPattern.<a href="../UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern">HumanUserFactory</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-7.html">Prev Letter</a></li>
+<li><a href="index-9.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-8.html" target="_top">Frames</a></li>
+<li><a href="index-8.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index-files/index-9.html b/doc/index-files/index-9.html
index 7d88f95..45efa8e 100644
--- a/doc/index-files/index-9.html
+++ b/doc/index-files/index-9.html
@@ -1,157 +1,178 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>I-Index</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="I-Index";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-8.html">Prev Letter</a></li>
-<li><a href="index-10.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-9.html" target="_top">Frames</a></li>
-<li><a href="index-9.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:I">
-<!--   -->
-</a>
-<h2 class="title">I</h2>
-<dl>
-<dt><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Cli/Input.html#Input--">Input()</a></span> - Constructor for class Cli.<a href="../Cli/Input.html" title="class in Cli">Input</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#isActivated--">isActivated()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Order/Order.html#isFinalised--">isFinalised()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
-<dd>
-<div class="block">GETTER AND SETTER</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#isLogged--">isLogged()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect(String, String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#isState--">isState()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/package-summary.html">Item</a> - package Item</dt>
-<dd>&nbsp;</dd>
-<dt><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../Item/Item.html#Item-java.lang.String-java.lang.String-">Item(String, String)</a></span> - Constructor for class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
-<dd>
-<div class="block">CONSTRUCTOR</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../User/ListUser.html#iterator--">iterator()</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li class="navBarCell1Rev">Index</li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="index-8.html">Prev Letter</a></li>
-<li><a href="index-10.html">Next Letter</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?index-files/index-9.html" target="_top">Frames</a></li>
-<li><a href="index-9.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:42 CEST 2017 -->
+<title>I-Index</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="I-Index";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-8.html">Prev Letter</a></li>
+<li><a href="index-10.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-9.html" target="_top">Frames</a></li>
+<li><a href="index-9.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;<a name="I:I">
+<!--   -->
+</a>
+<h2 class="title">I</h2>
+<dl>
+<dt><a href="../Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a> - Class in <a href="../Others/package-summary.html">Others</a></dt>
+<dd>
+<div class="block">Allow to create unique numbers, especially usefull when creating new
+ fidelity cards.</div>
+</dd>
+<dt><a href="../User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a> - Class in <a href="../User/package-summary.html">User</a></dt>
+<dd>
+<div class="block">Attache an unique Id to the user.</div>
+</dd>
+<dt><a href="../Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a> - Class in <a href="../Cli/package-summary.html">Cli</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Input.html#Input--">Input()</a></span> - Constructor for class Cli.<a href="../Cli/Input.html" title="class in Cli">Input</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#isActivated--">isActivated()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Courier.html#isAvailable--">isAvailable()</a></span> - Method in class User.<a href="../User/Courier.html" title="class in User">Courier</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Order/Order.html#isFinalised--">isFinalised()</a></span> - Method in class Order.<a href="../Order/Order.html" title="class in Order">Order</a></dt>
+<dd>
+<div class="block">GETTER AND SETTER</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Command.html#isGoodArgument-java.util.ArrayList-">isGoodArgument(ArrayList&lt;String&gt;)</a></span> - Method in class Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#isLogged--">isLogged()</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/User.html#isLoginCorrect-java.lang.String-java.lang.String-">isLoginCorrect(String, String)</a></span> - Method in class User.<a href="../User/User.html" title="class in User">User</a></dt>
+<dd>
+<div class="block">CUSTOM</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Command.html#isOneWanted-java.lang.String-">isOneWanted(String)</a></span> - Method in class Cli.<a href="../Cli/Command.html" title="class in Cli">Command</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../User/Customer.html#isSpamAgree--">isSpamAgree()</a></span> - Method in class User.<a href="../User/Customer.html" title="class in User">Customer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/BirthdayOffer.html#isState--">isState()</a></span> - Method in class Offers.<a href="../Offers/BirthdayOffer.html" title="class in Offers">BirthdayOffer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Offers/MealOfTheWeek.html#isState--">isState()</a></span> - Method in class Offers.<a href="../Offers/MealOfTheWeek.html" title="class in Offers">MealOfTheWeek</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="../Cli/Token.html#isTockenCorrect-java.lang.String-">isTockenCorrect(String)</a></span> - Method in class Cli.<a href="../Cli/Token.html" title="class in Cli">Token</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/package-summary.html">Item</a> - package Item</dt>
+<dd>&nbsp;</dd>
+<dt><a href="../Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a> - Class in <a href="../Item/package-summary.html">Item</a></dt>
+<dd>
+<div class="block">An item is an abstraction of a meal or a dish.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../Item/Item.html#Item-java.lang.String-java.lang.String-">Item(String, String)</a></span> - Constructor for class Item.<a href="../Item/Item.html" title="class in Item">Item</a></dt>
+<dd>
+<div class="block">CONSTRUCTOR</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../User/ListUser.html#iterator--">iterator()</a></span> - Method in class User.<a href="../User/ListUser.html" title="class in User">ListUser</a></dt>
+<dd>&nbsp;</dd>
+</dl>
+<a href="index-1.html">A</a>&nbsp;<a href="index-2.html">B</a>&nbsp;<a href="index-3.html">C</a>&nbsp;<a href="index-4.html">D</a>&nbsp;<a href="index-5.html">E</a>&nbsp;<a href="index-6.html">F</a>&nbsp;<a href="index-7.html">G</a>&nbsp;<a href="index-8.html">H</a>&nbsp;<a href="index-9.html">I</a>&nbsp;<a href="index-10.html">L</a>&nbsp;<a href="index-11.html">M</a>&nbsp;<a href="index-12.html">N</a>&nbsp;<a href="index-13.html">O</a>&nbsp;<a href="index-14.html">P</a>&nbsp;<a href="index-15.html">R</a>&nbsp;<a href="index-16.html">S</a>&nbsp;<a href="index-17.html">T</a>&nbsp;<a href="index-18.html">U</a>&nbsp;<a href="index-19.html">V</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="index-8.html">Prev Letter</a></li>
+<li><a href="index-10.html">Next Letter</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?index-files/index-9.html" target="_top">Frames</a></li>
+<li><a href="index-9.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/index.html b/doc/index.html
index 3a1971b..78098a8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,75 +1,75 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Generated Documentation (Untitled)</title>
-<script type="text/javascript">
-    tmpTargetPage = "" + window.location.search;
-    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
-        tmpTargetPage = tmpTargetPage.substring(1);
-    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
-        tmpTargetPage = "undefined";
-    targetPage = tmpTargetPage;
-    function validURL(url) {
-        try {
-            url = decodeURIComponent(url);
-        }
-        catch (error) {
-            return false;
-        }
-        var pos = url.indexOf(".html");
-        if (pos == -1 || pos != url.length - 5)
-            return false;
-        var allowNumber = false;
-        var allowSep = false;
-        var seenDot = false;
-        for (var i = 0; i < url.length - 5; i++) {
-            var ch = url.charAt(i);
-            if ('a' <= ch && ch <= 'z' ||
-                    'A' <= ch && ch <= 'Z' ||
-                    ch == '$' ||
-                    ch == '_' ||
-                    ch.charCodeAt(0) > 127) {
-                allowNumber = true;
-                allowSep = true;
-            } else if ('0' <= ch && ch <= '9'
-                    || ch == '-') {
-                if (!allowNumber)
-                     return false;
-            } else if (ch == '/' || ch == '.') {
-                if (!allowSep)
-                    return false;
-                allowNumber = false;
-                allowSep = false;
-                if (ch == '.')
-                     seenDot = true;
-                if (ch == '/' && seenDot)
-                     return false;
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-    function loadFrames() {
-        if (targetPage != "" && targetPage != "undefined")
-             top.classFrame.location = top.targetPage;
-    }
-</script>
-</head>
-<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
-<frameset rows="30%,70%" title="Left frames" onload="top.loadFrames()">
-<frame src="overview-frame.html" name="packageListFrame" title="All Packages">
-<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-</frameset>
-<frame src="overview-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
-<noframes>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<h2>Frame Alert</h2>
-<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p>
-</noframes>
-</frameset>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>Generated Documentation (Untitled)</title>
+<script type="text/javascript">
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frameset rows="30%,70%" title="Left frames" onload="top.loadFrames()">
+<frame src="overview-frame.html" name="packageListFrame" title="All Packages">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+</frameset>
+<frame src="overview-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>
diff --git a/doc/overview-frame.html b/doc/overview-frame.html
index 138c00f..51bea9d 100644
--- a/doc/overview-frame.html
+++ b/doc/overview-frame.html
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Overview List</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<div class="indexHeader"><span><a href="allclasses-frame.html" target="packageFrame">All&nbsp;Classes</a></span></div>
-<div class="indexContainer">
-<h2 title="Packages">Packages</h2>
-<ul title="Packages">
-<li><a href="Cards/package-frame.html" target="packageFrame">Cards</a></li>
-<li><a href="Cli/package-frame.html" target="packageFrame">Cli</a></li>
-<li><a href="Core/package-frame.html" target="packageFrame">Core</a></li>
-<li><a href="DeliveryStrategy/package-frame.html" target="packageFrame">DeliveryStrategy</a></li>
-<li><a href="Exception/package-frame.html" target="packageFrame">Exception</a></li>
-<li><a href="Item/package-frame.html" target="packageFrame">Item</a></li>
-<li><a href="Offers/package-frame.html" target="packageFrame">Offers</a></li>
-<li><a href="Order/package-frame.html" target="packageFrame">Order</a></li>
-<li><a href="Others/package-frame.html" target="packageFrame">Others</a></li>
-<li><a href="provisoire/package-frame.html" target="packageFrame">provisoire</a></li>
-<li><a href="StrategyProfit/package-frame.html" target="packageFrame">StrategyProfit</a></li>
-<li><a href="test/package-frame.html" target="packageFrame">test</a></li>
-<li><a href="User/package-frame.html" target="packageFrame">User</a></li>
-<li><a href="UserFactoryPattern/package-frame.html" target="packageFrame">UserFactoryPattern</a></li>
-</ul>
-</div>
-<p>&nbsp;</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Overview List</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<div class="indexHeader"><span><a href="allclasses-frame.html" target="packageFrame">All&nbsp;Classes</a></span></div>
+<div class="indexContainer">
+<h2 title="Packages">Packages</h2>
+<ul title="Packages">
+<li><a href="Cards/package-frame.html" target="packageFrame">Cards</a></li>
+<li><a href="Cli/package-frame.html" target="packageFrame">Cli</a></li>
+<li><a href="Commands/package-frame.html" target="packageFrame">Commands</a></li>
+<li><a href="Core/package-frame.html" target="packageFrame">Core</a></li>
+<li><a href="DeliveryStrategy/package-frame.html" target="packageFrame">DeliveryStrategy</a></li>
+<li><a href="Exception/package-frame.html" target="packageFrame">Exception</a></li>
+<li><a href="Item/package-frame.html" target="packageFrame">Item</a></li>
+<li><a href="Offers/package-frame.html" target="packageFrame">Offers</a></li>
+<li><a href="Order/package-frame.html" target="packageFrame">Order</a></li>
+<li><a href="Others/package-frame.html" target="packageFrame">Others</a></li>
+<li><a href="StrategyProfit/package-frame.html" target="packageFrame">StrategyProfit</a></li>
+<li><a href="test/package-frame.html" target="packageFrame">test</a></li>
+<li><a href="User/package-frame.html" target="packageFrame">User</a></li>
+<li><a href="UserFactoryPattern/package-frame.html" target="packageFrame">UserFactoryPattern</a></li>
+</ul>
+</div>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/doc/overview-summary.html b/doc/overview-summary.html
index 47281f0..6891f91 100644
--- a/doc/overview-summary.html
+++ b/doc/overview-summary.html
@@ -1,187 +1,187 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Overview</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li class="navBarCell1Rev">Overview</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
-<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer">
-<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
-<caption><span>Packages</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Package</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="Cards/package-summary.html">Cards</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="Cli/package-summary.html">Cli</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="Core/package-summary.html">Core</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="DeliveryStrategy/package-summary.html">DeliveryStrategy</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="Exception/package-summary.html">Exception</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="Item/package-summary.html">Item</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="Offers/package-summary.html">Offers</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="Order/package-summary.html">Order</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="Others/package-summary.html">Others</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="provisoire/package-summary.html">provisoire</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="StrategyProfit/package-summary.html">StrategyProfit</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="test/package-summary.html">test</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="User/package-summary.html">User</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="UserFactoryPattern/package-summary.html">UserFactoryPattern</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li class="navBarCell1Rev">Overview</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
-<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:43 CEST 2017 -->
+<title>Overview</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Overview";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Overview</li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer">
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
+<caption><span>Packages</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="Cards/package-summary.html">Cards</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="Cli/package-summary.html">Cli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="Commands/package-summary.html">Commands</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="Core/package-summary.html">Core</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="DeliveryStrategy/package-summary.html">DeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="Exception/package-summary.html">Exception</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="Item/package-summary.html">Item</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="Offers/package-summary.html">Offers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="Order/package-summary.html">Order</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="Others/package-summary.html">Others</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="StrategyProfit/package-summary.html">StrategyProfit</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="test/package-summary.html">test</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="User/package-summary.html">User</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="UserFactoryPattern/package-summary.html">UserFactoryPattern</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li class="navBarCell1Rev">Overview</li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-summary.html" target="_top">Frames</a></li>
+<li><a href="overview-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/overview-tree.html b/doc/overview-tree.html
index 7933d04..2a693fc 100644
--- a/doc/overview-tree.html
+++ b/doc/overview-tree.html
@@ -1,255 +1,321 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
-<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For All Packages</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="Cards/package-tree.html">Cards</a>, </li>
-<li><a href="Cli/package-tree.html">Cli</a>, </li>
-<li><a href="Core/package-tree.html">Core</a>, </li>
-<li><a href="DeliveryStrategy/package-tree.html">DeliveryStrategy</a>, </li>
-<li><a href="Exception/package-tree.html">Exception</a>, </li>
-<li><a href="Item/package-tree.html">Item</a>, </li>
-<li><a href="Offers/package-tree.html">Offers</a>, </li>
-<li><a href="Order/package-tree.html">Order</a>, </li>
-<li><a href="Others/package-tree.html">Others</a>, </li>
-<li><a href="provisoire/package-tree.html">provisoire</a>, </li>
-<li><a href="StrategyProfit/package-tree.html">StrategyProfit</a>, </li>
-<li><a href="test/package-tree.html">test</a>, </li>
-<li><a href="User/package-tree.html">User</a>, </li>
-<li><a href="UserFactoryPattern/package-tree.html">UserFactoryPattern</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">Core.<a href="Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a></li>
-<li type="circle">Others.<a href="Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a></li>
-<li type="circle">Cli.<a href="Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a></li>
-<li type="circle">Cli.<a href="Cli/Confirm.html" title="class in Cli"><span class="typeNameLink">Confirm</span></a></li>
-<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> (implements Core.<a href="Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
-<li type="circle">StrategyProfit.<a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a></li>
-<li type="circle">Others.<a href="Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">entities</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">entities.ContextDeliveryPolicy</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">entities.ContextTargetProfit</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">entities.Courier</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">entities.Customer</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">entities.Manager</span></a></li>
-<li type="circle">provisoire.<a href="provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">entities.Restaurant</span></a></li>
-<li type="circle">Item.<a href="Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a></li>
-<li type="circle">Item.<a href="Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a></li>
-<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a></li>
-<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a> (implements DeliveryStrategy.<a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a>)</li>
-<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a> (implements DeliveryStrategy.<a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy">StrategyDeliveryPolicy</a>)</li>
-<li type="circle">Cards.<a href="Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)
-<ul>
-<li type="circle">Cards.<a href="Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-<li type="circle">Cards.<a href="Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-<li type="circle">Cards.<a href="Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
-</ul>
-</li>
-<li type="circle">Order.<a href="Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a></li>
-<li type="circle">Others.<a href="Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a></li>
-<li type="circle">User.<a href="User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a></li>
-<li type="circle">Cli.<a href="Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a></li>
-<li type="circle">Item.<a href="Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a> (implements Item.<a href="Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>)
-<ul>
-<li type="circle">Item.<a href="Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a> (implements Item.<a href="Item/VisitablePrice.html" title="interface in Item">VisitablePrice</a>)
-<ul>
-<li type="circle">Item.<a href="Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a></li>
-<li type="circle">Item.<a href="Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a></li>
-<li type="circle">Item.<a href="Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a></li>
-</ul>
-</li>
-<li type="circle">Item.<a href="Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a> (implements Item.<a href="Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>)
-<ul>
-<li type="circle">Item.<a href="Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a></li>
-<li type="circle">Item.<a href="Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">User.<a href="User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;T&gt; (implements java.lang.Iterable&lt;T&gt;)</li>
-<li type="circle">test.<a href="test/main.html" title="class in test"><span class="typeNameLink">main</span></a></li>
-<li type="circle">Item.<a href="Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a></li>
-<li type="circle">Offers.<a href="Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> (implements Offers.<a href="Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
-<li type="circle">Core.<a href="Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a></li>
-<li type="circle">Order.<a href="Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> (implements java.lang.Comparable&lt;T&gt;, Item.<a href="Item/VisitorPrice.html" title="interface in Item">VisitorPrice</a>)</li>
-<li type="circle">Others.<a href="Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a></li>
-<li type="circle">Others.<a href="Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a></li>
-<li type="circle">StrategyProfit.<a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a>
-<ul>
-<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a></li>
-<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a></li>
-<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a></li>
-</ul>
-</li>
-<li type="circle">java.lang.Throwable (implements java.io.Serializable)
-<ul>
-<li type="circle">java.lang.Exception
-<ul>
-<li type="circle">Exception.<a href="Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a></li>
-<li type="circle">Exception.<a href="Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a></li>
-<li type="circle">Exception.<a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">User.<a href="User/User.html" title="class in User"><span class="typeNameLink">User</span></a> (implements java.lang.Comparable&lt;T&gt;)
-<ul>
-<li type="circle">User.<a href="User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a>
-<ul>
-<li type="circle">User.<a href="User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a></li>
-<li type="circle">User.<a href="User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> (implements Offers.<a href="Offers/Observer.html" title="interface in Offers">Observer</a>, Cards.<a href="Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>)</li>
-<li type="circle">User.<a href="User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a></li>
-</ul>
-</li>
-<li type="circle">User.<a href="User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a>
-<ul>
-<li type="circle">User.<a href="User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a>
-<ul>
-<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a></li>
-<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">Core.<a href="Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a></li>
-<li type="circle">Offers.<a href="Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a></li>
-<li type="circle">Offers.<a href="Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a></li>
-<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="interface in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a></li>
-<li type="circle">Cards.<a href="Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a></li>
-<li type="circle">Item.<a href="Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a></li>
-<li type="circle">Cards.<a href="Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a></li>
-<li type="circle">Item.<a href="Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a></li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
-<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For All Packages</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="Cards/package-tree.html">Cards</a>, </li>
+<li><a href="Cli/package-tree.html">Cli</a>, </li>
+<li><a href="Commands/package-tree.html">Commands</a>, </li>
+<li><a href="Core/package-tree.html">Core</a>, </li>
+<li><a href="DeliveryStrategy/package-tree.html">DeliveryStrategy</a>, </li>
+<li><a href="Exception/package-tree.html">Exception</a>, </li>
+<li><a href="Item/package-tree.html">Item</a>, </li>
+<li><a href="Offers/package-tree.html">Offers</a>, </li>
+<li><a href="Order/package-tree.html">Order</a>, </li>
+<li><a href="Others/package-tree.html">Others</a>, </li>
+<li><a href="StrategyProfit/package-tree.html">StrategyProfit</a>, </li>
+<li><a href="test/package-tree.html">test</a>, </li>
+<li><a href="User/package-tree.html">User</a>, </li>
+<li><a href="UserFactoryPattern/package-tree.html">UserFactoryPattern</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">Core.<a href="Core/ActiveUserContext.html" title="class in Core"><span class="typeNameLink">ActiveUserContext</span></a></li>
+<li type="circle">Others.<a href="Others/Adress.html" title="class in Others"><span class="typeNameLink">Adress</span></a></li>
+<li type="circle">Offers.<a href="Offers/BirthdayOffer.html" title="class in Offers"><span class="typeNameLink">BirthdayOffer</span></a> (implements Offers.<a href="Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
+<li type="circle">Cli.<a href="Cli/Clui.html" title="class in Cli"><span class="typeNameLink">Clui</span></a></li>
+<li type="circle">Cli.<a href="Cli/Command.html" title="class in Cli"><span class="typeNameLink">Command</span></a>
+<ul>
+<li type="circle">Commands.<a href="Commands/AddDishRestaurantMenu.html" title="class in Commands"><span class="typeNameLink">AddDishRestaurantMenu</span></a></li>
+<li type="circle">Commands.<a href="Commands/AddDishToMeal.html" title="class in Commands"><span class="typeNameLink">AddDishToMeal</span></a></li>
+<li type="circle">Commands.<a href="Commands/AddItemToOrder.html" title="class in Commands"><span class="typeNameLink">AddItemToOrder</span></a></li>
+<li type="circle">Commands.<a href="Commands/AssociateCard.html" title="class in Commands"><span class="typeNameLink">AssociateCard</span></a></li>
+<li type="circle">Commands.<a href="Commands/CreateMeal.html" title="class in Commands"><span class="typeNameLink">CreateMeal</span></a></li>
+<li type="circle">Commands.<a href="Commands/CreateOrder.html" title="class in Commands"><span class="typeNameLink">CreateOrder</span></a></li>
+<li type="circle">Commands.<a href="Commands/EndOrder.html" title="class in Commands"><span class="typeNameLink">EndOrder</span></a></li>
+<li type="circle">Commands.<a href="Commands/EndOrderAt.html" title="class in Commands"><span class="typeNameLink">EndOrderAt</span></a></li>
+<li type="circle">Commands.<a href="Commands/FindDeliverer.html" title="class in Commands"><span class="typeNameLink">FindDeliverer</span></a></li>
+<li type="circle">Commands.<a href="Commands/Help.html" title="class in Commands"><span class="typeNameLink">Help</span></a></li>
+<li type="circle">Commands.<a href="Commands/Login.html" title="class in Commands"><span class="typeNameLink">Login</span></a></li>
+<li type="circle">Commands.<a href="Commands/Logout.html" title="class in Commands"><span class="typeNameLink">Logout</span></a></li>
+<li type="circle">Commands.<a href="Commands/OffDuty.html" title="class in Commands"><span class="typeNameLink">OffDuty</span></a></li>
+<li type="circle">Commands.<a href="Commands/OnDuty.html" title="class in Commands"><span class="typeNameLink">OnDuty</span></a></li>
+<li type="circle">Commands.<a href="Commands/RegisterCourier.html" title="class in Commands"><span class="typeNameLink">RegisterCourier</span></a></li>
+<li type="circle">Commands.<a href="Commands/RegisterCustomer.html" title="class in Commands"><span class="typeNameLink">RegisterCustomer</span></a></li>
+<li type="circle">Commands.<a href="Commands/RegisterManager.html" title="class in Commands"><span class="typeNameLink">RegisterManager</span></a></li>
+<li type="circle">Commands.<a href="Commands/RegisterRestaurant.html" title="class in Commands"><span class="typeNameLink">RegisterRestaurant</span></a></li>
+<li type="circle">Commands.<a href="Commands/RemoveSpecialOffer.html" title="class in Commands"><span class="typeNameLink">RemoveSpecialOffer</span></a></li>
+<li type="circle">Commands.<a href="Commands/RenameMeal.html" title="class in Commands"><span class="typeNameLink">RenameMeal</span></a></li>
+<li type="circle">Commands.<a href="Commands/RunTest.html" title="class in Commands"><span class="typeNameLink">RunTest</span></a></li>
+<li type="circle">Commands.<a href="Commands/SetDeliveryPolicy.html" title="class in Commands"><span class="typeNameLink">SetDeliveryPolicy</span></a></li>
+<li type="circle">Commands.<a href="Commands/SetProfitPolicy.html" title="class in Commands"><span class="typeNameLink">SetProfitPolicy</span></a></li>
+<li type="circle">Commands.<a href="Commands/SetSpecialOffer.html" title="class in Commands"><span class="typeNameLink">SetSpecialOffer</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowCourier.html" title="class in Commands"><span class="typeNameLink">ShowCourier</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowCourierOrdered.html" title="class in Commands"><span class="typeNameLink">ShowCourierOrdered</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowCustomer.html" title="class in Commands"><span class="typeNameLink">ShowCustomer</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowMeal.html" title="class in Commands"><span class="typeNameLink">ShowMeal</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowMenuItem.html" title="class in Commands"><span class="typeNameLink">ShowMenuItem</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowProfitBetween.html" title="class in Commands"><span class="typeNameLink">ShowProfitBetween</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowRestaurantTop.html" title="class in Commands"><span class="typeNameLink">ShowRestaurantTop</span></a></li>
+<li type="circle">Commands.<a href="Commands/ShowTotalProfit.html" title="class in Commands"><span class="typeNameLink">ShowTotalProfit</span></a></li>
+</ul>
+</li>
+<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/ContextDeliveryStrategy.html" title="class in DeliveryStrategy"><span class="typeNameLink">ContextDeliveryStrategy</span></a> (implements Core.<a href="Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
+<li type="circle">StrategyProfit.<a href="StrategyProfit/ContextTargetProfitStrategy.html" title="class in StrategyProfit"><span class="typeNameLink">ContextTargetProfitStrategy</span></a> (implements Core.<a href="Core/ContextStrategy.html" title="interface in Core">ContextStrategy</a>)</li>
+<li type="circle">Others.<a href="Others/Date.html" title="class in Others"><span class="typeNameLink">Date</span></a></li>
+<li type="circle">Item.<a href="Item/FactoryDish.html" title="class in Item"><span class="typeNameLink">FactoryDish</span></a></li>
+<li type="circle">Item.<a href="Item/FactoryMeal.html" title="class in Item"><span class="typeNameLink">FactoryMeal</span></a></li>
+<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/FactoryUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">FactoryUserFactory</span></a></li>
+<li type="circle">Cards.<a href="Cards/FidelityCard.html" title="class in Cards"><span class="typeNameLink">FidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)
+<ul>
+<li type="circle">Cards.<a href="Cards/BasicFidelityCard.html" title="class in Cards"><span class="typeNameLink">BasicFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+<li type="circle">Cards.<a href="Cards/LotteryFidelityCard.html" title="class in Cards"><span class="typeNameLink">LotteryFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+<li type="circle">Cards.<a href="Cards/PointFidelityCard.html" title="class in Cards"><span class="typeNameLink">PointFidelityCard</span></a> (implements Cards.<a href="Cards/VisitableCard.html" title="interface in Cards">VisitableCard</a>)</li>
+</ul>
+</li>
+<li type="circle">Order.<a href="Order/HistoricOrder.html" title="class in Order"><span class="typeNameLink">HistoricOrder</span></a></li>
+<li type="circle">Others.<a href="Others/Historique.html" title="class in Others"><span class="typeNameLink">Historique</span></a></li>
+<li type="circle">Others.<a href="Others/IDCard.html" title="class in Others"><span class="typeNameLink">IDCard</span></a></li>
+<li type="circle">User.<a href="User/IDUser.html" title="class in User"><span class="typeNameLink">IDUser</span></a></li>
+<li type="circle">Cli.<a href="Cli/Input.html" title="class in Cli"><span class="typeNameLink">Input</span></a></li>
+<li type="circle">Item.<a href="Item/Item.html" title="class in Item"><span class="typeNameLink">Item</span></a>
+<ul>
+<li type="circle">Item.<a href="Item/Dish.html" title="class in Item"><span class="typeNameLink">Dish</span></a>
+<ul>
+<li type="circle">Item.<a href="Item/Dessert.html" title="class in Item"><span class="typeNameLink">Dessert</span></a></li>
+<li type="circle">Item.<a href="Item/MainDish.html" title="class in Item"><span class="typeNameLink">MainDish</span></a></li>
+<li type="circle">Item.<a href="Item/Starter.html" title="class in Item"><span class="typeNameLink">Starter</span></a></li>
+</ul>
+</li>
+<li type="circle">Item.<a href="Item/Meal.html" title="class in Item"><span class="typeNameLink">Meal</span></a>
+<ul>
+<li type="circle">Item.<a href="Item/FullMeal.html" title="class in Item"><span class="typeNameLink">FullMeal</span></a></li>
+<li type="circle">Item.<a href="Item/HalfMeal.html" title="class in Item"><span class="typeNameLink">HalfMeal</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">User.<a href="User/ListUser.html" title="class in User"><span class="typeNameLink">ListUser</span></a>&lt;T&gt; (implements java.lang.Iterable&lt;T&gt;)</li>
+<li type="circle">Core.<a href="Core/Main.html" title="class in Core"><span class="typeNameLink">Main</span></a></li>
+<li type="circle">Item.<a href="Item/MealFactory.html" title="class in Item"><span class="typeNameLink">MealFactory</span></a></li>
+<li type="circle">Offers.<a href="Offers/MealOfTheWeek.html" title="class in Offers"><span class="typeNameLink">MealOfTheWeek</span></a> (implements Offers.<a href="Offers/ObservableOffer.html" title="interface in Offers">ObservableOffer</a>)</li>
+<li type="circle">Core.<a href="Core/MyFoodora.html" title="class in Core"><span class="typeNameLink">MyFoodora</span></a></li>
+<li type="circle">Order.<a href="Order/Order.html" title="class in Order"><span class="typeNameLink">Order</span></a> (implements java.lang.Comparable&lt;T&gt;)</li>
+<li type="circle">Others.<a href="Others/Period.html" title="class in Others"><span class="typeNameLink">Period</span></a></li>
+<li type="circle">Others.<a href="Others/Position.html" title="class in Others"><span class="typeNameLink">Position</span></a></li>
+<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/StrategyDeliveryPolicy.html" title="class in DeliveryStrategy"><span class="typeNameLink">StrategyDeliveryPolicy</span></a>
+<ul>
+<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/FairOccupationDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FairOccupationDelivery</span></a></li>
+<li type="circle">DeliveryStrategy.<a href="DeliveryStrategy/FastestDelivery.html" title="class in DeliveryStrategy"><span class="typeNameLink">FastestDelivery</span></a></li>
+</ul>
+</li>
+<li type="circle">StrategyProfit.<a href="StrategyProfit/StrategyTargetProfitPolicy.html" title="class in StrategyProfit"><span class="typeNameLink">StrategyTargetProfitPolicy</span></a>
+<ul>
+<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitDeliveryCost.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitDeliveryCost</span></a></li>
+<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitMarkup.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitMarkup</span></a></li>
+<li type="circle">StrategyProfit.<a href="StrategyProfit/TargetProfitServiceFee.html" title="class in StrategyProfit"><span class="typeNameLink">TargetProfitServiceFee</span></a></li>
+</ul>
+</li>
+<li type="circle">test.<a href="test/TestCard.html" title="class in test"><span class="typeNameLink">TestCard</span></a></li>
+<li type="circle">test.<a href="test/TestCli.html" title="class in test"><span class="typeNameLink">TestCli</span></a></li>
+<li type="circle">test.<a href="test/TestCore.html" title="class in test"><span class="typeNameLink">TestCore</span></a></li>
+<li type="circle">test.<a href="test/TestCourier.html" title="class in test"><span class="typeNameLink">TestCourier</span></a></li>
+<li type="circle">test.<a href="test/TestCustomer.html" title="class in test"><span class="typeNameLink">TestCustomer</span></a></li>
+<li type="circle">test.<a href="test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">TestDeliveryStrategy</span></a></li>
+<li type="circle">test.<a href="test/TestException.html" title="class in test"><span class="typeNameLink">TestException</span></a></li>
+<li type="circle">test.<a href="test/TestItem.html" title="class in test"><span class="typeNameLink">TestItem</span></a></li>
+<li type="circle">test.<a href="test/TestManager.html" title="class in test"><span class="typeNameLink">TestManager</span></a></li>
+<li type="circle">test.<a href="test/TestOffers.html" title="class in test"><span class="typeNameLink">TestOffers</span></a></li>
+<li type="circle">test.<a href="test/TestOrder.html" title="class in test"><span class="typeNameLink">TestOrder</span></a></li>
+<li type="circle">test.<a href="test/TestOthers.html" title="class in test"><span class="typeNameLink">TestOthers</span></a></li>
+<li type="circle">test.<a href="test/TestRestaurant.html" title="class in test"><span class="typeNameLink">TestRestaurant</span></a></li>
+<li type="circle">test.<a href="test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">TestTargetProfitStrategy</span></a></li>
+<li type="circle">test.<a href="test/TestUserFactory.html" title="class in test"><span class="typeNameLink">TestUserFactory</span></a></li>
+<li type="circle">java.lang.Throwable (implements java.io.Serializable)
+<ul>
+<li type="circle">java.lang.Exception
+<ul>
+<li type="circle">Cli.<a href="Cli/errorWrongFormatValue.html" title="class in Cli"><span class="typeNameLink">errorWrongFormatValue</span></a></li>
+<li type="circle">Cli.<a href="Cli/errorWrongNumberOfParams.html" title="class in Cli"><span class="typeNameLink">errorWrongNumberOfParams</span></a></li>
+<li type="circle">Cli.<a href="Cli/errorWrongTypeOfUser.html" title="class in Cli"><span class="typeNameLink">errorWrongTypeOfUser</span></a></li>
+<li type="circle">Exception.<a href="Exception/ExceptionUnknownDishType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownDishType</span></a></li>
+<li type="circle">Exception.<a href="Exception/ExceptionUnknownMealType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownMealType</span></a></li>
+<li type="circle">Exception.<a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownStartegyType</span></a></li>
+<li type="circle">Exception.<a href="Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception"><span class="typeNameLink">ExceptionUnknownTypeOfUser</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">Cli.<a href="Cli/Token.html" title="class in Cli"><span class="typeNameLink">Token</span></a></li>
+<li type="circle">User.<a href="User/User.html" title="class in User"><span class="typeNameLink">User</span></a> (implements java.lang.Comparable&lt;T&gt;)
+<ul>
+<li type="circle">User.<a href="User/HumanUser.html" title="class in User"><span class="typeNameLink">HumanUser</span></a>
+<ul>
+<li type="circle">User.<a href="User/Courier.html" title="class in User"><span class="typeNameLink">Courier</span></a></li>
+<li type="circle">User.<a href="User/Customer.html" title="class in User"><span class="typeNameLink">Customer</span></a> (implements Offers.<a href="Offers/Observer.html" title="interface in Offers">Observer</a>, Cards.<a href="Cards/VisiterCard.html" title="interface in Cards">VisiterCard</a>)</li>
+<li type="circle">User.<a href="User/Manager.html" title="class in User"><span class="typeNameLink">Manager</span></a></li>
+</ul>
+</li>
+<li type="circle">User.<a href="User/MoralUser.html" title="class in User"><span class="typeNameLink">MoralUser</span></a>
+<ul>
+<li type="circle">User.<a href="User/Restaurant.html" title="class in User"><span class="typeNameLink">Restaurant</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/UserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">UserFactory</span></a>
+<ul>
+<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/HumanUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">HumanUserFactory</span></a></li>
+<li type="circle">UserFactoryPattern.<a href="UserFactoryPattern/MoralUserFactory.html" title="class in UserFactoryPattern"><span class="typeNameLink">MoralUserFactory</span></a></li>
+</ul>
+</li>
+<li type="circle">User.<a href="User/UserFactory.html" title="class in User"><span class="typeNameLink">UserFactory</span></a></li>
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">Core.<a href="Core/ContextStrategy.html" title="interface in Core"><span class="typeNameLink">ContextStrategy</span></a></li>
+<li type="circle">Offers.<a href="Offers/ObservableOffer.html" title="interface in Offers"><span class="typeNameLink">ObservableOffer</span></a></li>
+<li type="circle">Offers.<a href="Offers/Observer.html" title="interface in Offers"><span class="typeNameLink">Observer</span></a></li>
+<li type="circle">Cards.<a href="Cards/VisitableCard.html" title="interface in Cards"><span class="typeNameLink">VisitableCard</span></a></li>
+<li type="circle">Item.<a href="Item/VisitablePrice.html" title="interface in Item"><span class="typeNameLink">VisitablePrice</span></a></li>
+<li type="circle">Cards.<a href="Cards/VisiterCard.html" title="interface in Cards"><span class="typeNameLink">VisiterCard</span></a></li>
+<li type="circle">Item.<a href="Item/VisitorPrice.html" title="interface in Item"><span class="typeNameLink">VisitorPrice</span></a></li>
+</ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
+<ul>
+<li type="circle">Cli.<a href="Cli/Token.TypeToken.html" title="enum in Cli"><span class="typeNameLink">Token.TypeToken</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?overview-tree.html" target="_top">Frames</a></li>
+<li><a href="overview-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/package-list b/doc/package-list
index 7c64463..c6facf5 100644
--- a/doc/package-list
+++ b/doc/package-list
@@ -1,14 +1,14 @@
-Cards
-Cli
-Core
-DeliveryStrategy
-Exception
-Item
-Offers
-Order
-Others
-StrategyProfit
-User
-UserFactoryPattern
-provisoire
-test
+Cards
+Cli
+Commands
+Core
+DeliveryStrategy
+Exception
+Item
+Offers
+Order
+Others
+StrategyProfit
+User
+UserFactoryPattern
+test
diff --git a/doc/provisoire/class-use/entities.ContextDeliveryPolicy.html b/doc/provisoire/class-use/entities.ContextDeliveryPolicy.html
index d04be22..a304bb5 100644
--- a/doc/provisoire/class-use/entities.ContextDeliveryPolicy.html
+++ b/doc/provisoire/class-use/entities.ContextDeliveryPolicy.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.ContextDeliveryPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.ContextDeliveryPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.ContextDeliveryPolicy" class="title">Uses of Class<br>provisoire.entities.ContextDeliveryPolicy</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.ContextDeliveryPolicy</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.ContextDeliveryPolicy</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.ContextDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.ContextDeliveryPolicy" class="title">Uses of Class<br>provisoire.entities.ContextDeliveryPolicy</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.ContextDeliveryPolicy</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.ContextTargetProfit.html b/doc/provisoire/class-use/entities.ContextTargetProfit.html
index e097174..c725da4 100644
--- a/doc/provisoire/class-use/entities.ContextTargetProfit.html
+++ b/doc/provisoire/class-use/entities.ContextTargetProfit.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.ContextTargetProfit</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.ContextTargetProfit";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.ContextTargetProfit" class="title">Uses of Class<br>provisoire.entities.ContextTargetProfit</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.ContextTargetProfit</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.ContextTargetProfit</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.ContextTargetProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.ContextTargetProfit" class="title">Uses of Class<br>provisoire.entities.ContextTargetProfit</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.ContextTargetProfit</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.Courier.html b/doc/provisoire/class-use/entities.Courier.html
index 8b1c64c..f1c099c 100644
--- a/doc/provisoire/class-use/entities.Courier.html
+++ b/doc/provisoire/class-use/entities.Courier.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.Courier</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.Courier";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Courier.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Courier.html" target="_top">Frames</a></li>
-<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.Courier" class="title">Uses of Class<br>provisoire.entities.Courier</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.Courier</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Courier.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Courier.html" target="_top">Frames</a></li>
-<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.Courier</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.Courier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Courier.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Courier.html" target="_top">Frames</a></li>
+<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.Courier" class="title">Uses of Class<br>provisoire.entities.Courier</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.Courier</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Courier.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Courier.html" target="_top">Frames</a></li>
+<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.Customer.html b/doc/provisoire/class-use/entities.Customer.html
index 372974a..ee45d90 100644
--- a/doc/provisoire/class-use/entities.Customer.html
+++ b/doc/provisoire/class-use/entities.Customer.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.Customer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.Customer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Customer.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Customer.html" target="_top">Frames</a></li>
-<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.Customer" class="title">Uses of Class<br>provisoire.entities.Customer</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.Customer</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Customer.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Customer.html" target="_top">Frames</a></li>
-<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.Customer</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.Customer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Customer.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Customer.html" target="_top">Frames</a></li>
+<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.Customer" class="title">Uses of Class<br>provisoire.entities.Customer</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.Customer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Customer.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Customer.html" target="_top">Frames</a></li>
+<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.Manager.html b/doc/provisoire/class-use/entities.Manager.html
index 9da7c13..0c0615b 100644
--- a/doc/provisoire/class-use/entities.Manager.html
+++ b/doc/provisoire/class-use/entities.Manager.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.Manager</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.Manager";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Manager.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Manager.html" target="_top">Frames</a></li>
-<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.Manager" class="title">Uses of Class<br>provisoire.entities.Manager</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.Manager</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Manager.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Manager.html" target="_top">Frames</a></li>
-<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.Manager</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.Manager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Manager.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Manager.html" target="_top">Frames</a></li>
+<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.Manager" class="title">Uses of Class<br>provisoire.entities.Manager</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.Manager</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Manager.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Manager.html" target="_top">Frames</a></li>
+<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.Restaurant.html b/doc/provisoire/class-use/entities.Restaurant.html
index 579336f..b63994c 100644
--- a/doc/provisoire/class-use/entities.Restaurant.html
+++ b/doc/provisoire/class-use/entities.Restaurant.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Class provisoire.entities.Restaurant</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities.Restaurant";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Restaurant.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Restaurant.html" target="_top">Frames</a></li>
-<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities.Restaurant" class="title">Uses of Class<br>provisoire.entities.Restaurant</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities.Restaurant</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.Restaurant.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.Restaurant.html" target="_top">Frames</a></li>
-<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Class provisoire.entities.Restaurant</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities.Restaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Restaurant.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Restaurant.html" target="_top">Frames</a></li>
+<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities.Restaurant" class="title">Uses of Class<br>provisoire.entities.Restaurant</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities.Restaurant</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.Restaurant.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.Restaurant.html" target="_top">Frames</a></li>
+<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/class-use/entities.html b/doc/provisoire/class-use/entities.html
index ca6e2e4..cf6f21d 100644
--- a/doc/provisoire/class-use/entities.html
+++ b/doc/provisoire/class-use/entities.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class provisoire.entities</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class provisoire.entities";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.html" target="_top">Frames</a></li>
-<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class provisoire.entities" class="title">Uses of Class<br>provisoire.entities</h2>
-</div>
-<div class="classUseContainer">No usage of provisoire.entities</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../provisoire/entities.html" title="class in provisoire">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?provisoire/class-use/entities.html" target="_top">Frames</a></li>
-<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>Uses of Class provisoire.entities</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class provisoire.entities";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.html" target="_top">Frames</a></li>
+<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class provisoire.entities" class="title">Uses of Class<br>provisoire.entities</h2>
+</div>
+<div class="classUseContainer">No usage of provisoire.entities</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../provisoire/entities.html" title="class in provisoire">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?provisoire/class-use/entities.html" target="_top">Frames</a></li>
+<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.ContextDeliveryPolicy.html b/doc/provisoire/entities.ContextDeliveryPolicy.html
index a9a5cfe..5e337a2 100644
--- a/doc/provisoire/entities.ContextDeliveryPolicy.html
+++ b/doc/provisoire/entities.ContextDeliveryPolicy.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.ContextDeliveryPolicy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.ContextDeliveryPolicy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.ContextDeliveryPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.ContextDeliveryPolicy" class="title">Class entities.ContextDeliveryPolicy</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.ContextDeliveryPolicy</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.ContextDeliveryPolicy</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextDeliveryPolicy.html#ContextDeliveryPolicy--">ContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ContextDeliveryPolicy--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ContextDeliveryPolicy</h4>
-<pre>public&nbsp;ContextDeliveryPolicy()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.ContextDeliveryPolicy.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.ContextDeliveryPolicy</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.ContextDeliveryPolicy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.ContextDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.ContextDeliveryPolicy" class="title">Class entities.ContextDeliveryPolicy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.ContextDeliveryPolicy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.ContextDeliveryPolicy</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextDeliveryPolicy.html#ContextDeliveryPolicy--">ContextDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ContextDeliveryPolicy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ContextDeliveryPolicy</h4>
+<pre>public&nbsp;ContextDeliveryPolicy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.ContextDeliveryPolicy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.ContextDeliveryPolicy.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextDeliveryPolicy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.ContextTargetProfit.html b/doc/provisoire/entities.ContextTargetProfit.html
index ad2cba6..c3cb84f 100644
--- a/doc/provisoire/entities.ContextTargetProfit.html
+++ b/doc/provisoire/entities.ContextTargetProfit.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.ContextTargetProfit</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.ContextTargetProfit";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.ContextTargetProfit.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.ContextTargetProfit" class="title">Class entities.ContextTargetProfit</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.ContextTargetProfit</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.ContextTargetProfit</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextTargetProfit.html#ContextTargetProfit--">ContextTargetProfit</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ContextTargetProfit--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ContextTargetProfit</h4>
-<pre>public&nbsp;ContextTargetProfit()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.ContextTargetProfit.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
-<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.ContextTargetProfit</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.ContextTargetProfit";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.ContextTargetProfit.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.ContextTargetProfit" class="title">Class entities.ContextTargetProfit</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.ContextTargetProfit</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.ContextTargetProfit</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextTargetProfit.html#ContextTargetProfit--">ContextTargetProfit</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ContextTargetProfit--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ContextTargetProfit</h4>
+<pre>public&nbsp;ContextTargetProfit()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.ContextTargetProfit.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.ContextTargetProfit.html" target="_top">Frames</a></li>
+<li><a href="entities.ContextTargetProfit.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.Courier.html b/doc/provisoire/entities.Courier.html
index d7af0cc..0b6eff3 100644
--- a/doc/provisoire/entities.Courier.html
+++ b/doc/provisoire/entities.Courier.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.Courier</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.Courier";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Courier.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Courier.html" target="_top">Frames</a></li>
-<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.Courier" class="title">Class entities.Courier</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.Courier</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.Courier</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Courier.html#Courier--">Courier</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Courier--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Courier</h4>
-<pre>public&nbsp;Courier()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Courier.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Courier.html" target="_top">Frames</a></li>
-<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.Courier</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.Courier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Courier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Courier.html" target="_top">Frames</a></li>
+<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.Courier" class="title">Class entities.Courier</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.Courier</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.Courier</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Courier.html#Courier--">Courier</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Courier--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Courier</h4>
+<pre>public&nbsp;Courier()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Courier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Courier.html" target="_top">Frames</a></li>
+<li><a href="entities.Courier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.Customer.html b/doc/provisoire/entities.Customer.html
index ad0503c..a03fdc7 100644
--- a/doc/provisoire/entities.Customer.html
+++ b/doc/provisoire/entities.Customer.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.Customer</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.Customer";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Customer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Customer.html" target="_top">Frames</a></li>
-<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.Customer" class="title">Class entities.Customer</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.Customer</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.Customer</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Customer.html#Customer--">Customer</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Customer--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Customer</h4>
-<pre>public&nbsp;Customer()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Customer.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Customer.html" target="_top">Frames</a></li>
-<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.Customer</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.Customer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Customer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Customer.html" target="_top">Frames</a></li>
+<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.Customer" class="title">Class entities.Customer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.Customer</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.Customer</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Customer.html#Customer--">Customer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Customer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Customer</h4>
+<pre>public&nbsp;Customer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Customer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Customer.html" target="_top">Frames</a></li>
+<li><a href="entities.Customer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.Manager.html b/doc/provisoire/entities.Manager.html
index e03140a..f6ef30d 100644
--- a/doc/provisoire/entities.Manager.html
+++ b/doc/provisoire/entities.Manager.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.Manager</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.Manager";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Manager.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Manager.html" target="_top">Frames</a></li>
-<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.Manager" class="title">Class entities.Manager</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.Manager</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.Manager</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Manager.html#Manager--">Manager</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Manager--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Manager</h4>
-<pre>public&nbsp;Manager()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Manager.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Manager.html" target="_top">Frames</a></li>
-<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.Manager</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.Manager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Manager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Manager.html" target="_top">Frames</a></li>
+<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.Manager" class="title">Class entities.Manager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.Manager</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.Manager</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Manager.html#Manager--">Manager</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Manager--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Manager</h4>
+<pre>public&nbsp;Manager()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Manager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Manager.html" target="_top">Frames</a></li>
+<li><a href="entities.Manager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.Restaurant.html b/doc/provisoire/entities.Restaurant.html
index 4ee0b97..f72c0c5 100644
--- a/doc/provisoire/entities.Restaurant.html
+++ b/doc/provisoire/entities.Restaurant.html
@@ -1,241 +1,241 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities.Restaurant</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities.Restaurant";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Restaurant.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Restaurant.html" target="_top">Frames</a></li>
-<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities.Restaurant" class="title">Class entities.Restaurant</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities.Restaurant</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities.Restaurant</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Restaurant.html#Restaurant--">Restaurant</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="Restaurant--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>Restaurant</h4>
-<pre>public&nbsp;Restaurant()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.Restaurant.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.Restaurant.html" target="_top">Frames</a></li>
-<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities.Restaurant</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities.Restaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Restaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Restaurant.html" target="_top">Frames</a></li>
+<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities.Restaurant" class="title">Class entities.Restaurant</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities.Restaurant</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../provisoire/entities.html" title="class in provisoire">entities</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities.Restaurant</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.Restaurant.html#Restaurant--">Restaurant</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Restaurant--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Restaurant</h4>
+<pre>public&nbsp;Restaurant()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.Restaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.Restaurant.html" target="_top">Frames</a></li>
+<li><a href="entities.Restaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/entities.html b/doc/provisoire/entities.html
index eae977b..d00ff28 100644
--- a/doc/provisoire/entities.html
+++ b/doc/provisoire/entities.html
@@ -1,276 +1,276 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>entities</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="entities";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.html" target="_top">Frames</a></li>
-<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">provisoire</div>
-<h2 title="Class entities" class="title">Class entities</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>provisoire.entities</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">entities</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
-<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">entities.ContextDeliveryPolicy</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">entities.ContextTargetProfit</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Courier.html" title="class in provisoire">entities.Courier</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Customer.html" title="class in provisoire">entities.Customer</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Manager.html" title="class in provisoire">entities.Manager</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Restaurant.html" title="class in provisoire">entities.Restaurant</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.html#entities--">entities</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="entities--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>entities</h4>
-<pre>public&nbsp;entities()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/entities.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/entities.html" target="_top">Frames</a></li>
-<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>entities</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="entities";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.html" target="_top">Frames</a></li>
+<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">provisoire</div>
+<h2 title="Class entities" class="title">Class entities</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>provisoire.entities</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">entities</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire">entities.ContextDeliveryPolicy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire">entities.ContextTargetProfit</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Courier.html" title="class in provisoire">entities.Courier</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Customer.html" title="class in provisoire">entities.Customer</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Manager.html" title="class in provisoire">entities.Manager</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../provisoire/entities.Restaurant.html" title="class in provisoire">entities.Restaurant</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../provisoire/entities.html#entities--">entities</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="entities--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entities</h4>
+<pre>public&nbsp;entities()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/entities.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/entities.html" target="_top">Frames</a></li>
+<li><a href="entities.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/package-frame.html b/doc/provisoire/package-frame.html
index ddfadbe..50913df 100644
--- a/doc/provisoire/package-frame.html
+++ b/doc/provisoire/package-frame.html
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>provisoire</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../provisoire/package-summary.html" target="classFrame">provisoire</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="entities.html" title="class in provisoire" target="classFrame">entities</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>provisoire</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../provisoire/package-summary.html" target="classFrame">provisoire</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="entities.html" title="class in provisoire" target="classFrame">entities</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/provisoire/package-summary.html b/doc/provisoire/package-summary.html
index c7a30ff..3309d4f 100644
--- a/doc/provisoire/package-summary.html
+++ b/doc/provisoire/package-summary.html
@@ -1,142 +1,142 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>provisoire</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="provisoire";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;provisoire</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../provisoire/entities.html" title="class in provisoire">entities</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>provisoire</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="provisoire";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;provisoire</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../provisoire/entities.html" title="class in provisoire">entities</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../StrategyProfit/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/package-tree.html b/doc/provisoire/package-tree.html
index 7b71fc5..dc0663c 100644
--- a/doc/provisoire/package-tree.html
+++ b/doc/provisoire/package-tree.html
@@ -1,143 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>provisoire Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="provisoire Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/package-tree.html">Prev</a></li>
-<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package provisoire</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">provisoire.<a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">entities</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">entities.ContextDeliveryPolicy</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">entities.ContextTargetProfit</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">entities.Courier</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">entities.Customer</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">entities.Manager</span></a></li>
-<li type="circle">provisoire.<a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">entities.Restaurant</span></a></li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../Others/package-tree.html">Prev</a></li>
-<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>provisoire Class Hierarchy</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="provisoire Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-tree.html">Prev</a></li>
+<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package provisoire</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">provisoire.<a href="../provisoire/entities.html" title="class in provisoire"><span class="typeNameLink">entities</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.ContextDeliveryPolicy.html" title="class in provisoire"><span class="typeNameLink">entities.ContextDeliveryPolicy</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.ContextTargetProfit.html" title="class in provisoire"><span class="typeNameLink">entities.ContextTargetProfit</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.Courier.html" title="class in provisoire"><span class="typeNameLink">entities.Courier</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.Customer.html" title="class in provisoire"><span class="typeNameLink">entities.Customer</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.Manager.html" title="class in provisoire"><span class="typeNameLink">entities.Manager</span></a></li>
+<li type="circle">provisoire.<a href="../provisoire/entities.Restaurant.html" title="class in provisoire"><span class="typeNameLink">entities.Restaurant</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../Others/package-tree.html">Prev</a></li>
+<li><a href="../StrategyProfit/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/provisoire/package-use.html b/doc/provisoire/package-use.html
index 20b47da..15bd19e 100644
--- a/doc/provisoire/package-use.html
+++ b/doc/provisoire/package-use.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package provisoire</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package provisoire";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package provisoire" class="title">Uses of Package<br>provisoire</h1>
-</div>
-<div class="contentContainer">No usage of provisoire</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?provisoire/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
+<title>Uses of Package provisoire</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package provisoire";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package provisoire" class="title">Uses of Package<br>provisoire</h1>
+</div>
+<div class="contentContainer">No usage of provisoire</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?provisoire/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/script.js b/doc/script.js
index b346356..c3a1cae 100644
--- a/doc/script.js
+++ b/doc/script.js
@@ -1,30 +1,30 @@
-function show(type)
-{
-    count = 0;
-    for (var key in methods) {
-        var row = document.getElementById(key);
-        if ((methods[key] &  type) != 0) {
-            row.style.display = '';
-            row.className = (count++ % 2) ? rowColor : altColor;
-        }
-        else
-            row.style.display = 'none';
-    }
-    updateTabs(type);
-}
-
-function updateTabs(type)
-{
-    for (var value in tabs) {
-        var sNode = document.getElementById(tabs[value][0]);
-        var spanNode = sNode.firstChild;
-        if (value == type) {
-            sNode.className = activeTableTab;
-            spanNode.innerHTML = tabs[value][1];
-        }
-        else {
-            sNode.className = tableTab;
-            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
-        }
-    }
-}
+function show(type)
+{
+    count = 0;
+    for (var key in methods) {
+        var row = document.getElementById(key);
+        if ((methods[key] &  type) != 0) {
+            row.style.display = '';
+            row.className = (count++ % 2) ? rowColor : altColor;
+        }
+        else
+            row.style.display = 'none';
+    }
+    updateTabs(type);
+}
+
+function updateTabs(type)
+{
+    for (var value in tabs) {
+        var sNode = document.getElementById(tabs[value][0]);
+        var spanNode = sNode.firstChild;
+        if (value == type) {
+            sNode.className = activeTableTab;
+            spanNode.innerHTML = tabs[value][1];
+        }
+        else {
+            sNode.className = tableTab;
+            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
+        }
+    }
+}
diff --git a/doc/serialized-form.html b/doc/serialized-form.html
index 2febcf5..6f19fb3 100644
--- a/doc/serialized-form.html
+++ b/doc/serialized-form.html
@@ -1,159 +1,200 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Serialized Form</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
-<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Serialized Form" class="title">Serialized Form</h1>
-</div>
-<div class="serializedFormContainer">
-<ul class="blockList">
-<li class="blockList">
-<h2 title="Package">Package&nbsp;Exception</h2>
-<ul class="blockList">
-<li class="blockList"><a name="Exception.ExceptionUnknownDishType">
-<!--   -->
-</a>
-<h3>Class <a href="Exception/ExceptionUnknownDishType.html" title="class in Exception">Exception.ExceptionUnknownDishType</a> extends java.lang.Exception implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>3147255315073491030L</dd>
-</dl>
-</li>
-<li class="blockList"><a name="Exception.ExceptionUnknownMealType">
-<!--   -->
-</a>
-<h3>Class <a href="Exception/ExceptionUnknownMealType.html" title="class in Exception">Exception.ExceptionUnknownMealType</a> extends java.lang.Exception implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>8804200291546048941L</dd>
-</dl>
-</li>
-<li class="blockList"><a name="Exception.ExceptionUnknownStartegyType">
-<!--   -->
-</a>
-<h3>Class <a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Exception.ExceptionUnknownStartegyType</a> extends java.lang.Exception implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>-7678301440060327944L</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="overview-summary.html">Overview</a></li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="deprecated-list.html">Deprecated</a></li>
-<li><a href="index-files/index-1.html">Index</a></li>
-<li><a href="help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
-<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>Serialized Form</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Serialized Form";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Serialized Form" class="title">Serialized Form</h1>
+</div>
+<div class="serializedFormContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2 title="Package">Package&nbsp;Cli</h2>
+<ul class="blockList">
+<li class="blockList"><a name="Cli.errorWrongFormatValue">
+<!--   -->
+</a>
+<h3>Class <a href="Cli/errorWrongFormatValue.html" title="class in Cli">Cli.errorWrongFormatValue</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>7873997091472426895L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="Cli.errorWrongNumberOfParams">
+<!--   -->
+</a>
+<h3>Class <a href="Cli/errorWrongNumberOfParams.html" title="class in Cli">Cli.errorWrongNumberOfParams</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>3780895191640653344L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="Cli.errorWrongTypeOfUser">
+<!--   -->
+</a>
+<h3>Class <a href="Cli/errorWrongTypeOfUser.html" title="class in Cli">Cli.errorWrongTypeOfUser</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>7904486798144733615L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
+<h2 title="Package">Package&nbsp;Exception</h2>
+<ul class="blockList">
+<li class="blockList"><a name="Exception.ExceptionUnknownDishType">
+<!--   -->
+</a>
+<h3>Class <a href="Exception/ExceptionUnknownDishType.html" title="class in Exception">Exception.ExceptionUnknownDishType</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>3147255315073491030L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="Exception.ExceptionUnknownMealType">
+<!--   -->
+</a>
+<h3>Class <a href="Exception/ExceptionUnknownMealType.html" title="class in Exception">Exception.ExceptionUnknownMealType</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>8804200291546048941L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="Exception.ExceptionUnknownStartegyType">
+<!--   -->
+</a>
+<h3>Class <a href="Exception/ExceptionUnknownStartegyType.html" title="class in Exception">Exception.ExceptionUnknownStartegyType</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>-7678301440060327944L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="Exception.ExceptionUnknownTypeOfUser">
+<!--   -->
+</a>
+<h3>Class <a href="Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">Exception.ExceptionUnknownTypeOfUser</a> extends java.lang.Exception implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>147789654641165L</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="overview-summary.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-files/index-1.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?serialized-form.html" target="_top">Frames</a></li>
+<li><a href="serialized-form.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/stylesheet.css b/doc/stylesheet.css
index 98055b2..b8dad08 100644
--- a/doc/stylesheet.css
+++ b/doc/stylesheet.css
@@ -1,574 +1,574 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
-    background-color:#ffffff;
-    color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
-    margin:0;
-}
-a:link, a:visited {
-    text-decoration:none;
-    color:#4A6782;
-}
-a:hover, a:focus {
-    text-decoration:none;
-    color:#bb7a2a;
-}
-a:active {
-    text-decoration:none;
-    color:#4A6782;
-}
-a[name] {
-    color:#353833;
-}
-a[name]:hover {
-    text-decoration:none;
-    color:#353833;
-}
-pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-}
-h1 {
-    font-size:20px;
-}
-h2 {
-    font-size:18px;
-}
-h3 {
-    font-size:16px;
-    font-style:italic;
-}
-h4 {
-    font-size:13px;
-}
-h5 {
-    font-size:12px;
-}
-h6 {
-    font-size:11px;
-}
-ul {
-    list-style-type:disc;
-}
-code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-    margin-top:8px;
-    line-height:1.4em;
-}
-dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-}
-table tr td dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    vertical-align:top;
-    padding-top:4px;
-}
-sup {
-    font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
-    clear:both;
-    height:0px;
-    overflow:hidden;
-}
-.aboutLanguage {
-    float:right;
-    padding:0px 21px;
-    font-size:11px;
-    z-index:200;
-    margin-top:-9px;
-}
-.legalCopy {
-    margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
-    color:#FFFFFF;
-    text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
-    color:#bb7a2a;
-}
-.tab {
-    background-color:#0066FF;
-    color:#ffffff;
-    padding:8px;
-    width:5em;
-    font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    padding:.8em .5em .4em .8em;
-    height:auto;/*height:1.8em;*/
-    font-size:11px;
-    margin:0;
-}
-.topNav {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px; 
-}
-.bottomNav {
-    margin-top:10px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav {
-    background-color:#dee3e9;
-    float:left;
-    width:100%;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav div {
-    clear:left;
-    float:left;
-    padding:0 0 5px 6px;
-    text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
-    float:left;
-    margin:0 25px 0 0;
-    padding:0;
-}
-ul.navList li{
-    list-style:none;
-    float:left;
-    padding: 5px 6px;
-    text-transform:uppercase;
-}
-ul.subNavList li{
-    list-style:none;
-    float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
-    color:#FFFFFF;
-    text-decoration:none;
-    text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
-    text-decoration:none;
-    color:#bb7a2a;
-    text-transform:uppercase;
-}
-.navBarCell1Rev {
-    background-color:#F8981D;
-    color:#253441;
-    margin: auto 5px;
-}
-.skipNav {
-    position:absolute;
-    top:auto;
-    left:-9999px;
-    overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
-    clear:both;
-    margin:0 20px;
-    padding:5px 0 0 0;
-}
-.indexHeader {
-    margin:10px;
-    position:relative;
-}
-.indexHeader span{
-    margin-right:15px;
-}
-.indexHeader h1 {
-    font-size:13px;
-}
-.title {
-    color:#2c4557;
-    margin:10px 0;
-}
-.subTitle {
-    margin:5px 0 0 0;
-}
-.header ul {
-    margin:0 0 15px 0;
-    padding:0;
-}
-.footer ul {
-    margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
-    list-style:none;
-    font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
-    padding:0;
-    margin:15px 0;
-}
-ul.blockList li.blockList h2 {
-    padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
-    clear:both;
-    padding:10px 20px;
-    position:relative;
-}
-.indexContainer {
-    margin:10px;
-    position:relative;
-    font-size:12px;
-}
-.indexContainer h2 {
-    font-size:13px;
-    padding:0 0 3px 0;
-}
-.indexContainer ul {
-    margin:0;
-    padding:0;
-}
-.indexContainer ul li {
-    list-style:none;
-    padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
-    font-size:12px;
-    font-weight:bold;
-    margin:10px 0 0 0;
-    color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
-    margin:5px 0 10px 0px;
-    font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
-    margin-left:1px;
-    font-size:1.1em;
-    display:inline;
-    font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
-    margin:0 0 0 1px;
-    font-size:1.1em;
-    display:inline;
-}
-/*
-List styles
-*/
-ul.horizontal li {
-    display:inline;
-    font-size:0.9em;
-}
-ul.inheritance {
-    margin:0;
-    padding:0;
-}
-ul.inheritance li {
-    display:inline;
-    list-style:none;
-}
-ul.inheritance li ul.inheritance {
-    margin-left:15px;
-    padding-left:15px;
-    padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
-    margin:10px 0 10px 0;
-    padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
-    list-style:none;
-    margin-bottom:15px;
-    line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
-    padding:0px 20px 5px 10px;
-    border:1px solid #ededed; 
-    background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
-    padding:0 0 5px 8px;
-    background-color:#ffffff;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
-    margin-left:0;
-    padding-left:0;
-    padding-bottom:15px;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
-    list-style:none;
-    border-bottom:none;
-    padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
-    margin-top:0;
-    margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
-    width:100%;
-    border-left:1px solid #EEE; 
-    border-right:1px solid #EEE; 
-    border-bottom:1px solid #EEE; 
-}
-.overviewSummary, .memberSummary  {
-    padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
-    position:relative;
-    text-align:left;
-    background-repeat:no-repeat;
-    color:#253441;
-    font-weight:bold;
-    clear:none;
-    overflow:hidden;
-    padding:0px;
-    padding-top:10px;
-    padding-left:1px;
-    margin:0px;
-    white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
-    color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    border: none;
-    height:16px;
-}
-.memberSummary caption span.activeTableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    height:16px;
-}
-.memberSummary caption span.tableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#4D7A97;
-    height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
-    padding-top:0px;
-    padding-left:0px;
-    padding-right:0px;
-    background-image:none;
-    float:none;
-    display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
-    display:none;
-    width:5px;
-    position:relative;
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative; 
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative;
-    background-color:#4D7A97;
-    float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
-    text-align:left;
-    padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
-    vertical-align:top;
-    padding-right:0px;
-    padding-top:8px;
-    padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
-    background:#dee3e9;
-    text-align:left;
-    padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
-    white-space:nowrap;
-    font-size:13px;
-}
-td.colLast, th.colLast {
-    font-size:13px;
-}
-td.colOne, th.colOne {
-    font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
-    width:25%;
-    vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
-    font-weight:bold;
-}
-.tableSubHeadingColor {
-    background-color:#EEEEFF;
-}
-.altColor {
-    background-color:#FFFFFF;
-}
-.rowColor {
-    background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
-    margin-top:0;
-}
-.deprecatedContent {
-    margin:0;
-    padding:10px 0;
-}
-.docSummary {
-    padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    font-style:normal;
-}
-
-div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
-    padding-top:0px;
-}
-
-
-td.colLast a {
-    padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
-    color:green;
-    padding:0 30px 0 0;
-}
-h1.hidden {
-    visibility:hidden;
-    overflow:hidden;
-    font-size:10px;
-}
-.block {
-    display:block;
-    margin:3px 10px 2px 0px;
-    color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
-    font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
-    font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
-    font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
-    padding-bottom:0px;
-}
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D7A97;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D7A97;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
diff --git a/doc/test/TestCard.html b/doc/test/TestCard.html
new file mode 100644
index 0000000..65255dd
--- /dev/null
+++ b/doc/test/TestCard.html
@@ -0,0 +1,434 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCard.html" target="_top">Frames</a></li>
+<li><a href="TestCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestCard" class="title">Class TestCard</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestCard</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestCard</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestCard.html#TestCard--">TestCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#testGetReduction--">testGetReduction</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#testIDCard--">testIDCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#testPercentageInTheCard--">testPercentageInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCard.html#testPointInTheCard--">testPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCard.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCard.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCard.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCard.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCard.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestCard--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestCard</h4>
+<pre>public&nbsp;TestCard()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testIDCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testIDCard</h4>
+<pre>public&nbsp;void&nbsp;testIDCard()</pre>
+</li>
+</ul>
+<a name="testPointInTheCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testPointInTheCard</h4>
+<pre>public&nbsp;void&nbsp;testPointInTheCard()
+                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                               <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                               <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testPercentageInTheCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testPercentageInTheCard</h4>
+<pre>public&nbsp;void&nbsp;testPercentageInTheCard()
+                             throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                    <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetReduction--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetReduction</h4>
+<pre>public&nbsp;void&nbsp;testGetReduction()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCard.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCard.html" target="_top">Frames</a></li>
+<li><a href="TestCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestCli.html b/doc/test/TestCli.html
new file mode 100644
index 0000000..19415f9
--- /dev/null
+++ b/doc/test/TestCli.html
@@ -0,0 +1,312 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestCli</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestCli";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCli.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCard.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCli.html" target="_top">Frames</a></li>
+<li><a href="TestCli.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestCli" class="title">Class TestCli</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestCli</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestCli</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>org.junit.rules.ExpectedException</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCli.html#exception">exception</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestCli.html#TestCli--">TestCli</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCli.html#testClui--">testClui</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="exception">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>exception</h4>
+<pre>public final&nbsp;org.junit.rules.ExpectedException exception</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestCli--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestCli</h4>
+<pre>public&nbsp;TestCli()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testClui--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testClui</h4>
+<pre>public&nbsp;void&nbsp;testClui()
+              throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCli.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCard.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCli.html" target="_top">Frames</a></li>
+<li><a href="TestCli.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestCore.html b/doc/test/TestCore.html
new file mode 100644
index 0000000..02ce454
--- /dev/null
+++ b/doc/test/TestCore.html
@@ -0,0 +1,462 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestCore</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestCore";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCore.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCore.html" target="_top">Frames</a></li>
+<li><a href="TestCore.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestCore" class="title">Class TestCore</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestCore</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestCore</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestCore.html#TestCore--">TestCore</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#testGetLastMonthIncome--">testGetLastMonthIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#testGetLastMonthNumberOfCommands--">testGetLastMonthNumberOfCommands</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#testGetUserByLogin--">testGetUserByLogin</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#testGetUserByName--">testGetUserByName</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCore.html#testRemoveWithID--">testRemoveWithID</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCore.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCore.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCore.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCore.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCore.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestCore--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestCore</h4>
+<pre>public&nbsp;TestCore()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testGetUserByLogin--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetUserByLogin</h4>
+<pre>public&nbsp;void&nbsp;testGetUserByLogin()
+                        throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a>,
+                               <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetUserByName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetUserByName</h4>
+<pre>public&nbsp;void&nbsp;testGetUserByName()
+                       throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a>,
+                              <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRemoveWithID--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRemoveWithID</h4>
+<pre>public&nbsp;void&nbsp;testRemoveWithID()
+                      throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a>,
+                             <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetLastMonthIncome--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetLastMonthIncome</h4>
+<pre>public&nbsp;void&nbsp;testGetLastMonthIncome()
+                            throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetLastMonthNumberOfCommands--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetLastMonthNumberOfCommands</h4>
+<pre>public&nbsp;void&nbsp;testGetLastMonthNumberOfCommands()
+                                      throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCore.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCore.html" target="_top">Frames</a></li>
+<li><a href="TestCore.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestCourier.html b/doc/test/TestCourier.html
new file mode 100644
index 0000000..abeb71f
--- /dev/null
+++ b/doc/test/TestCourier.html
@@ -0,0 +1,485 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCourier.html" target="_top">Frames</a></li>
+<li><a href="TestCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestCourier" class="title">Class TestCourier</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestCourier</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestCourier</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestCourier.html#TestCourier--">TestCourier</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testAcceptDelivery--">testAcceptDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testGetNbOfOrderOfTheDay--">testGetNbOfOrderOfTheDay</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testRegister--">testRegister</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testSetAvailable--">testSetAvailable</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testSetNotAvailable--">testSetNotAvailable</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testSetPosition--">testSetPosition</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCourier.html#testUnregister--">testUnregister</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCourier.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCourier.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCourier.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCourier.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCourier.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestCourier--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestCourier</h4>
+<pre>public&nbsp;TestCourier()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testSetPosition--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSetPosition</h4>
+<pre>public&nbsp;void&nbsp;testSetPosition()</pre>
+</li>
+</ul>
+<a name="testSetAvailable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSetAvailable</h4>
+<pre>public&nbsp;void&nbsp;testSetAvailable()</pre>
+</li>
+</ul>
+<a name="testSetNotAvailable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSetNotAvailable</h4>
+<pre>public&nbsp;void&nbsp;testSetNotAvailable()</pre>
+</li>
+</ul>
+<a name="testRegister--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRegister</h4>
+<pre>public&nbsp;void&nbsp;testRegister()
+                  throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testUnregister--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testUnregister</h4>
+<pre>public&nbsp;void&nbsp;testUnregister()
+                    throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testAcceptDelivery--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAcceptDelivery</h4>
+<pre>public&nbsp;void&nbsp;testAcceptDelivery()
+                        throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                               <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                               <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetNbOfOrderOfTheDay--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetNbOfOrderOfTheDay</h4>
+<pre>public&nbsp;void&nbsp;testGetNbOfOrderOfTheDay()
+                              throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                     <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                     <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCourier.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCourier.html" target="_top">Frames</a></li>
+<li><a href="TestCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestCustomer.html b/doc/test/TestCustomer.html
new file mode 100644
index 0000000..0042e34
--- /dev/null
+++ b/doc/test/TestCustomer.html
@@ -0,0 +1,480 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCustomer.html" target="_top">Frames</a></li>
+<li><a href="TestCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestCustomer" class="title">Class TestCustomer</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestCustomer</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestCustomer</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#TestCustomer--">TestCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testAcceptSpam--">testAcceptSpam</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testGetCard--">testGetCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testGetPointInTheCard--">testGetPointInTheCard</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testPlaceOrder--">testPlaceOrder</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testRefuseSpam--">testRefuseSpam</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testRegisterFidelityPlan--">testRegisterFidelityPlan</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestCustomer.html#testUnregisterFidelityPlan--">testUnregisterFidelityPlan</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCustomer.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCustomer.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCustomer.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCustomer.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestCustomer.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestCustomer--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestCustomer</h4>
+<pre>public&nbsp;TestCustomer()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testGetCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetCard</h4>
+<pre>public&nbsp;void&nbsp;testGetCard()
+                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testPlaceOrder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testPlaceOrder</h4>
+<pre>public&nbsp;void&nbsp;testPlaceOrder()
+                    throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                           <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                           <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRegisterFidelityPlan--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRegisterFidelityPlan</h4>
+<pre>public&nbsp;void&nbsp;testRegisterFidelityPlan()</pre>
+</li>
+</ul>
+<a name="testUnregisterFidelityPlan--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testUnregisterFidelityPlan</h4>
+<pre>public&nbsp;void&nbsp;testUnregisterFidelityPlan()</pre>
+</li>
+</ul>
+<a name="testGetPointInTheCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetPointInTheCard</h4>
+<pre>public&nbsp;void&nbsp;testGetPointInTheCard()
+                           throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                  <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                  <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testAcceptSpam--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAcceptSpam</h4>
+<pre>public&nbsp;void&nbsp;testAcceptSpam()</pre>
+</li>
+</ul>
+<a name="testRefuseSpam--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testRefuseSpam</h4>
+<pre>public&nbsp;void&nbsp;testRefuseSpam()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestCustomer.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestCustomer.html" target="_top">Frames</a></li>
+<li><a href="TestCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestDeliveryStrategy.html b/doc/test/TestDeliveryStrategy.html
new file mode 100644
index 0000000..67cd598
--- /dev/null
+++ b/doc/test/TestDeliveryStrategy.html
@@ -0,0 +1,406 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestDeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestDeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestDeliveryStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestException.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestDeliveryStrategy" class="title">Class TestDeliveryStrategy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestDeliveryStrategy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestDeliveryStrategy</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#TestDeliveryStrategy--">TestDeliveryStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#testFairOccupation--">testFairOccupation</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestDeliveryStrategy.html#testFastestDelivery--">testFastestDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestDeliveryStrategy.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestDeliveryStrategy.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestDeliveryStrategy.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestDeliveryStrategy.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestDeliveryStrategy.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestDeliveryStrategy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestDeliveryStrategy</h4>
+<pre>public&nbsp;TestDeliveryStrategy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testFastestDelivery--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testFastestDelivery</h4>
+<pre>public&nbsp;void&nbsp;testFastestDelivery()
+                         throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testFairOccupation--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testFairOccupation</h4>
+<pre>public&nbsp;void&nbsp;testFairOccupation()
+                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                               <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestDeliveryStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestException.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestException.html b/doc/test/TestException.html
new file mode 100644
index 0000000..4b548eb
--- /dev/null
+++ b/doc/test/TestException.html
@@ -0,0 +1,438 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestException</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestException";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestException.html" target="_top">Frames</a></li>
+<li><a href="TestException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestException" class="title">Class TestException</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestException</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestException</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestException.html#TestException--">TestException</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownDishType--">testExceptionUnknownDishType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownMealType--">testExceptionUnknownMealType</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownStartegyDelivery--">testExceptionUnknownStartegyDelivery</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownStartegyProfit--">testExceptionUnknownStartegyProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestException.html#testExceptionUnknownTypeOfUser--">testExceptionUnknownTypeOfUser</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestException.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestException.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestException.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestException.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestException.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestException--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestException</h4>
+<pre>public&nbsp;TestException()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testExceptionUnknownDishType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testExceptionUnknownDishType</h4>
+<pre>public&nbsp;void&nbsp;testExceptionUnknownDishType()</pre>
+</li>
+</ul>
+<a name="testExceptionUnknownMealType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testExceptionUnknownMealType</h4>
+<pre>public&nbsp;void&nbsp;testExceptionUnknownMealType()</pre>
+</li>
+</ul>
+<a name="testExceptionUnknownStartegyDelivery--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testExceptionUnknownStartegyDelivery</h4>
+<pre>public&nbsp;void&nbsp;testExceptionUnknownStartegyDelivery()</pre>
+</li>
+</ul>
+<a name="testExceptionUnknownStartegyProfit--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testExceptionUnknownStartegyProfit</h4>
+<pre>public&nbsp;void&nbsp;testExceptionUnknownStartegyProfit()</pre>
+</li>
+</ul>
+<a name="testExceptionUnknownTypeOfUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testExceptionUnknownTypeOfUser</h4>
+<pre>public&nbsp;void&nbsp;testExceptionUnknownTypeOfUser()
+                                    throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                           <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestException.html" target="_top">Frames</a></li>
+<li><a href="TestException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestItem.html b/doc/test/TestItem.html
new file mode 100644
index 0000000..545119a
--- /dev/null
+++ b/doc/test/TestItem.html
@@ -0,0 +1,358 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:32 CEST 2017 -->
+<title>TestItem</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestItem";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestItem.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestException.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestItem.html" target="_top">Frames</a></li>
+<li><a href="TestItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestItem" class="title">Class TestItem</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestItem</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestItem</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestItem.html#TestItem--">TestItem</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestItem.html#testAddDish--">testAddDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestItem.html#testCreateDish--">testCreateDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestItem.html#testCreateFullMeal--">testCreateFullMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestItem.html#testCreateHalfMeal--">testCreateHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestItem.html#testRemoveDish--">testRemoveDish</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestItem--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestItem</h4>
+<pre>public&nbsp;TestItem()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testCreateDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCreateDish</h4>
+<pre>public&nbsp;void&nbsp;testCreateDish()
+                    throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testCreateHalfMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCreateHalfMeal</h4>
+<pre>public&nbsp;void&nbsp;testCreateHalfMeal()
+                        throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                               <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testCreateFullMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCreateFullMeal</h4>
+<pre>public&nbsp;void&nbsp;testCreateFullMeal()
+                        throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                               <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testAddDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAddDish</h4>
+<pre>public&nbsp;void&nbsp;testAddDish()
+                 throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                        <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                        java.io.IOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRemoveDish--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testRemoveDish</h4>
+<pre>public&nbsp;void&nbsp;testRemoveDish()
+                    throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                           <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestItem.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestException.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestItem.html" target="_top">Frames</a></li>
+<li><a href="TestItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestManager.html b/doc/test/TestManager.html
new file mode 100644
index 0000000..51a0676
--- /dev/null
+++ b/doc/test/TestManager.html
@@ -0,0 +1,654 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestManager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestManager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestManager.html" target="_top">Frames</a></li>
+<li><a href="TestManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestManager" class="title">Class TestManager</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestManager</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestManager</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestManager.html#TestManager--">TestManager</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testActivateUser--">testActivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testAddUser--">testAddUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testChangeServiceFee--">testChangeServiceFee</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testDesactivateUser--">testDesactivateUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetAverageIncomePerCustomer--">testGetAverageIncomePerCustomer</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetLeastActiveCourier--">testGetLeastActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetLeastSellingRestaurant--">testGetLeastSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetMostActiveCourier--">testGetMostActiveCourier</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetMostSellingRestaurant--">testGetMostSellingRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetTotalIncome--">testGetTotalIncome</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testGetTotalProfit--">testGetTotalProfit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testRemoveUser--">testRemoveUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testSetDeliveryPolicy--">testSetDeliveryPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestManager.html#testSetTargetProfitPolicy--">testSetTargetProfitPolicy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestManager.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestManager.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestManager.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestManager.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestManager.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestManager--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestManager</h4>
+<pre>public&nbsp;TestManager()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testAddUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAddUser</h4>
+<pre>public&nbsp;void&nbsp;testAddUser()
+                 throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                        <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRemoveUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRemoveUser</h4>
+<pre>public&nbsp;void&nbsp;testRemoveUser()
+                    throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                           <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testChangeServiceFee--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testChangeServiceFee</h4>
+<pre>public&nbsp;void&nbsp;testChangeServiceFee()
+                          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetTotalIncome--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetTotalIncome</h4>
+<pre>public&nbsp;void&nbsp;testGetTotalIncome()
+                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                               <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                               <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetTotalProfit--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetTotalProfit</h4>
+<pre>public&nbsp;void&nbsp;testGetTotalProfit()
+                        throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                               <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                               <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetAverageIncomePerCustomer--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetAverageIncomePerCustomer</h4>
+<pre>public&nbsp;void&nbsp;testGetAverageIncomePerCustomer()
+                                     throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                            <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                            <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testSetTargetProfitPolicy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSetTargetProfitPolicy</h4>
+<pre>public&nbsp;void&nbsp;testSetTargetProfitPolicy()
+                               throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testSetDeliveryPolicy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSetDeliveryPolicy</h4>
+<pre>public&nbsp;void&nbsp;testSetDeliveryPolicy()
+                           throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetMostSellingRestaurant--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetMostSellingRestaurant</h4>
+<pre>public&nbsp;void&nbsp;testGetMostSellingRestaurant()
+                                  throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                         <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                         <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetLeastSellingRestaurant--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetLeastSellingRestaurant</h4>
+<pre>public&nbsp;void&nbsp;testGetLeastSellingRestaurant()
+                                   throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                          <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                          <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetLeastActiveCourier--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetLeastActiveCourier</h4>
+<pre>public&nbsp;void&nbsp;testGetLeastActiveCourier()
+                               throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                      <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                      <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetMostActiveCourier--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetMostActiveCourier</h4>
+<pre>public&nbsp;void&nbsp;testGetMostActiveCourier()
+                              throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                     <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                     <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testActivateUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testActivateUser</h4>
+<pre>public&nbsp;void&nbsp;testActivateUser()
+                      throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                             <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testDesactivateUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testDesactivateUser</h4>
+<pre>public&nbsp;void&nbsp;testDesactivateUser()
+                         throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestManager.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestManager.html" target="_top">Frames</a></li>
+<li><a href="TestManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestOffers.html b/doc/test/TestOffers.html
new file mode 100644
index 0000000..c5d0175
--- /dev/null
+++ b/doc/test/TestOffers.html
@@ -0,0 +1,410 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestOffers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestOffers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOffers.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOffers.html" target="_top">Frames</a></li>
+<li><a href="TestOffers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestOffers" class="title">Class TestOffers</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestOffers</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestOffers</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestOffers.html#TestOffers--">TestOffers</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#testInFoodora--">testInFoodora</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOffers.html#testNotifyObservers--">testNotifyObservers</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestOffers.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestOffers.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestOffers.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestOffers.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestOffers.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestOffers--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestOffers</h4>
+<pre>public&nbsp;TestOffers()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testNotifyObservers--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testNotifyObservers</h4>
+<pre>public&nbsp;void&nbsp;testNotifyObservers()
+                         throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                                <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testInFoodora--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testInFoodora</h4>
+<pre>public&nbsp;void&nbsp;testInFoodora()
+                   throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                          <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                          <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                          <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOffers.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOffers.html" target="_top">Frames</a></li>
+<li><a href="TestOffers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestOrder.html b/doc/test/TestOrder.html
new file mode 100644
index 0000000..f0798cf
--- /dev/null
+++ b/doc/test/TestOrder.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOrder.html" target="_top">Frames</a></li>
+<li><a href="TestOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestOrder" class="title">Class TestOrder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestOrder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestOrder</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestOrder.html#TestOrder--">TestOrder</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOrder.html#testFinalize--">testFinalize</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOrder.html#testGetListOfOrderInAPeriod--">testGetListOfOrderInAPeriod</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOrder.html#testGetPrice--">testGetPrice</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestOrder--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestOrder</h4>
+<pre>public&nbsp;TestOrder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testFinalize--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testFinalize</h4>
+<pre>public&nbsp;void&nbsp;testFinalize()</pre>
+</li>
+</ul>
+<a name="testGetListOfOrderInAPeriod--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetListOfOrderInAPeriod</h4>
+<pre>public&nbsp;void&nbsp;testGetListOfOrderInAPeriod()</pre>
+</li>
+</ul>
+<a name="testGetPrice--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetPrice</h4>
+<pre>public&nbsp;void&nbsp;testGetPrice()
+                  throws <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                         <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOrder.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOrder.html" target="_top">Frames</a></li>
+<li><a href="TestOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestOthers.html b/doc/test/TestOthers.html
new file mode 100644
index 0000000..15fe3bb
--- /dev/null
+++ b/doc/test/TestOthers.html
@@ -0,0 +1,284 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestOthers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestOthers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOthers.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOthers.html" target="_top">Frames</a></li>
+<li><a href="TestOthers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestOthers" class="title">Class TestOthers</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestOthers</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestOthers</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestOthers.html#TestOthers--">TestOthers</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOthers.html#testAdressFromString--">testAdressFromString</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestOthers.html#testIDCard--">testIDCard</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestOthers--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestOthers</h4>
+<pre>public&nbsp;TestOthers()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testIDCard--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testIDCard</h4>
+<pre>public&nbsp;void&nbsp;testIDCard()</pre>
+</li>
+</ul>
+<a name="testAdressFromString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testAdressFromString</h4>
+<pre>public&nbsp;void&nbsp;testAdressFromString()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestOthers.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestOthers.html" target="_top">Frames</a></li>
+<li><a href="TestOthers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestRestaurant.html b/doc/test/TestRestaurant.html
new file mode 100644
index 0000000..0294860
--- /dev/null
+++ b/doc/test/TestRestaurant.html
@@ -0,0 +1,508 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestRestaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestRestaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestRestaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestRestaurant.html" target="_top">Frames</a></li>
+<li><a href="TestRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestRestaurant" class="title">Class TestRestaurant</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestRestaurant</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestRestaurant</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#TestRestaurant--">TestRestaurant</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testAddDish--">testAddDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testAddMeal--">testAddMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testGetSortListOfDish--">testGetSortListOfDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testGetSortListOfHalfMeal--">testGetSortListOfHalfMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testRemoveDish--">testRemoveDish</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testRemoveMeal--">testRemoveMeal</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestRestaurant.html#testSetMealOfTheWeek--">testSetMealOfTheWeek</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestRestaurant.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestRestaurant.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestRestaurant.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestRestaurant.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestRestaurant.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestRestaurant--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestRestaurant</h4>
+<pre>public&nbsp;TestRestaurant()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testAddMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAddMeal</h4>
+<pre>public&nbsp;void&nbsp;testAddMeal()
+                 throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                        <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testAddDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testAddDish</h4>
+<pre>public&nbsp;void&nbsp;testAddDish()
+                 throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRemoveMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRemoveMeal</h4>
+<pre>public&nbsp;void&nbsp;testRemoveMeal()
+                    throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                           <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testRemoveDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testRemoveDish</h4>
+<pre>public&nbsp;void&nbsp;testRemoveDish()
+                    throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetSortListOfHalfMeal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetSortListOfHalfMeal</h4>
+<pre>public&nbsp;void&nbsp;testGetSortListOfHalfMeal()
+                               throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                      <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetSortListOfDish--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testGetSortListOfDish</h4>
+<pre>public&nbsp;void&nbsp;testGetSortListOfDish()
+                           throws <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                  <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                  <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testSetMealOfTheWeek--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testSetMealOfTheWeek</h4>
+<pre>public&nbsp;void&nbsp;testSetMealOfTheWeek()
+                          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a>,
+                                 <a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a>,
+                                 <a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a>,
+                                 <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownMealType.html" title="class in Exception">ExceptionUnknownMealType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownDishType.html" title="class in Exception">ExceptionUnknownDishType</a></code></dd>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestRestaurant.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestRestaurant.html" target="_top">Frames</a></li>
+<li><a href="TestRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestTargetProfitStrategy.html b/doc/test/TestTargetProfitStrategy.html
new file mode 100644
index 0000000..867e885
--- /dev/null
+++ b/doc/test/TestTargetProfitStrategy.html
@@ -0,0 +1,420 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestTargetProfitStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestTargetProfitStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestTargetProfitStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestUserFactory.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestTargetProfitStrategy" class="title">Class TestTargetProfitStrategy</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestTargetProfitStrategy</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestTargetProfitStrategy</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#TestTargetProfitStrategy--">TestTargetProfitStrategy</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testDeliveryCost--">testDeliveryCost</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testMarkupPercentage--">testMarkupPercentage</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestTargetProfitStrategy.html#testServiceFee--">testServiceFee</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestTargetProfitStrategy.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestTargetProfitStrategy.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestTargetProfitStrategy.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestTargetProfitStrategy.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestTargetProfitStrategy.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestTargetProfitStrategy--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestTargetProfitStrategy</h4>
+<pre>public&nbsp;TestTargetProfitStrategy()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testDeliveryCost--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testDeliveryCost</h4>
+<pre>public&nbsp;void&nbsp;testDeliveryCost()
+                      throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testMarkupPercentage--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testMarkupPercentage</h4>
+<pre>public&nbsp;void&nbsp;testMarkupPercentage()
+                          throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testServiceFee--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testServiceFee</h4>
+<pre>public&nbsp;void&nbsp;testServiceFee()
+                    throws <a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownStartegyType.html" title="class in Exception">ExceptionUnknownStartegyType</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestTargetProfitStrategy.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../test/TestUserFactory.html" title="class in test"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/TestUserFactory.html b/doc/test/TestUserFactory.html
new file mode 100644
index 0000000..80d19f8
--- /dev/null
+++ b/doc/test/TestUserFactory.html
@@ -0,0 +1,402 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:33 CEST 2017 -->
+<title>TestUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="TestUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestUserFactory.html" target="_top">Frames</a></li>
+<li><a href="TestUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class TestUserFactory" class="title">Class TestUserFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.TestUserFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TestUserFactory</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#COURIER">COURIER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#CUSTOMER">CUSTOMER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#MANAGER">MANAGER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#RESTAURANT">RESTAURANT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#UNKNOWN">UNKNOWN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#TestUserFactory--">TestUserFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#testCreateHumanUser--">testCreateHumanUser</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/TestUserFactory.html#testCreateMoralUser--">testCreateMoralUser</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="UNKNOWN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UNKNOWN</h4>
+<pre>public static final&nbsp;int UNKNOWN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestUserFactory.UNKNOWN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="COURIER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>COURIER</h4>
+<pre>public static final&nbsp;int COURIER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestUserFactory.COURIER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="RESTAURANT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RESTAURANT</h4>
+<pre>public static final&nbsp;int RESTAURANT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestUserFactory.RESTAURANT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOMER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOMER</h4>
+<pre>public static final&nbsp;int CUSTOMER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestUserFactory.CUSTOMER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="MANAGER">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MANAGER</h4>
+<pre>public static final&nbsp;int MANAGER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../constant-values.html#test.TestUserFactory.MANAGER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestUserFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestUserFactory</h4>
+<pre>public&nbsp;TestUserFactory()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="testCreateHumanUser--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCreateHumanUser</h4>
+<pre>public&nbsp;void&nbsp;testCreateHumanUser()
+                         throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testCreateMoralUser--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testCreateMoralUser</h4>
+<pre>public&nbsp;void&nbsp;testCreateMoralUser()
+                         throws <a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../Exception/ExceptionUnknownTypeOfUser.html" title="class in Exception">ExceptionUnknownTypeOfUser</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestUserFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/TestUserFactory.html" target="_top">Frames</a></li>
+<li><a href="TestUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestCard.html b/doc/test/class-use/TestCard.html
new file mode 100644
index 0000000..6d336bf
--- /dev/null
+++ b/doc/test/class-use/TestCard.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestCard</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestCard";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCard.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCard.html" target="_top">Frames</a></li>
+<li><a href="TestCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestCard" class="title">Uses of Class<br>test.TestCard</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestCard</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCard.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCard.html" target="_top">Frames</a></li>
+<li><a href="TestCard.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestCli.html b/doc/test/class-use/TestCli.html
new file mode 100644
index 0000000..f331090
--- /dev/null
+++ b/doc/test/class-use/TestCli.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestCli</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestCli";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCli.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCli.html" target="_top">Frames</a></li>
+<li><a href="TestCli.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestCli" class="title">Uses of Class<br>test.TestCli</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestCli</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCli.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCli.html" target="_top">Frames</a></li>
+<li><a href="TestCli.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestCore.html b/doc/test/class-use/TestCore.html
new file mode 100644
index 0000000..da8655e
--- /dev/null
+++ b/doc/test/class-use/TestCore.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestCore</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestCore";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCore.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCore.html" target="_top">Frames</a></li>
+<li><a href="TestCore.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestCore" class="title">Uses of Class<br>test.TestCore</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestCore</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCore.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCore.html" target="_top">Frames</a></li>
+<li><a href="TestCore.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestCourier.html b/doc/test/class-use/TestCourier.html
new file mode 100644
index 0000000..00a5e0e
--- /dev/null
+++ b/doc/test/class-use/TestCourier.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestCourier</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestCourier";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCourier.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCourier.html" target="_top">Frames</a></li>
+<li><a href="TestCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestCourier" class="title">Uses of Class<br>test.TestCourier</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestCourier</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCourier.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCourier.html" target="_top">Frames</a></li>
+<li><a href="TestCourier.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestCustomer.html b/doc/test/class-use/TestCustomer.html
new file mode 100644
index 0000000..567c804
--- /dev/null
+++ b/doc/test/class-use/TestCustomer.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestCustomer</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestCustomer";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCustomer.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCustomer.html" target="_top">Frames</a></li>
+<li><a href="TestCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestCustomer" class="title">Uses of Class<br>test.TestCustomer</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestCustomer</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestCustomer.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestCustomer.html" target="_top">Frames</a></li>
+<li><a href="TestCustomer.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestDeliveryStrategy.html b/doc/test/class-use/TestDeliveryStrategy.html
new file mode 100644
index 0000000..44cfe80
--- /dev/null
+++ b/doc/test/class-use/TestDeliveryStrategy.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestDeliveryStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestDeliveryStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestDeliveryStrategy.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestDeliveryStrategy" class="title">Uses of Class<br>test.TestDeliveryStrategy</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestDeliveryStrategy</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestDeliveryStrategy.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestDeliveryStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestDeliveryStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestException.html b/doc/test/class-use/TestException.html
new file mode 100644
index 0000000..e0fdd7f
--- /dev/null
+++ b/doc/test/class-use/TestException.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestException</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestException";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestException.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestException.html" target="_top">Frames</a></li>
+<li><a href="TestException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestException" class="title">Uses of Class<br>test.TestException</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestException</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestException.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestException.html" target="_top">Frames</a></li>
+<li><a href="TestException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestItem.html b/doc/test/class-use/TestItem.html
new file mode 100644
index 0000000..295a630
--- /dev/null
+++ b/doc/test/class-use/TestItem.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestItem</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestItem";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestItem.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestItem.html" target="_top">Frames</a></li>
+<li><a href="TestItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestItem" class="title">Uses of Class<br>test.TestItem</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestItem</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestItem.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestItem.html" target="_top">Frames</a></li>
+<li><a href="TestItem.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestManager.html b/doc/test/class-use/TestManager.html
new file mode 100644
index 0000000..e2be5c7
--- /dev/null
+++ b/doc/test/class-use/TestManager.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestManager</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestManager";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestManager.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestManager.html" target="_top">Frames</a></li>
+<li><a href="TestManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestManager" class="title">Uses of Class<br>test.TestManager</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestManager</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestManager.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestManager.html" target="_top">Frames</a></li>
+<li><a href="TestManager.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestOffers.html b/doc/test/class-use/TestOffers.html
new file mode 100644
index 0000000..3bcbfad
--- /dev/null
+++ b/doc/test/class-use/TestOffers.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestOffers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestOffers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOffers.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOffers.html" target="_top">Frames</a></li>
+<li><a href="TestOffers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestOffers" class="title">Uses of Class<br>test.TestOffers</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestOffers</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOffers.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOffers.html" target="_top">Frames</a></li>
+<li><a href="TestOffers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestOrder.html b/doc/test/class-use/TestOrder.html
new file mode 100644
index 0000000..44fde29
--- /dev/null
+++ b/doc/test/class-use/TestOrder.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:38 CEST 2017 -->
+<title>Uses of Class test.TestOrder</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestOrder";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOrder.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOrder.html" target="_top">Frames</a></li>
+<li><a href="TestOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestOrder" class="title">Uses of Class<br>test.TestOrder</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestOrder</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOrder.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOrder.html" target="_top">Frames</a></li>
+<li><a href="TestOrder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestOthers.html b/doc/test/class-use/TestOthers.html
new file mode 100644
index 0000000..a63fff4
--- /dev/null
+++ b/doc/test/class-use/TestOthers.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class test.TestOthers</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestOthers";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOthers.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOthers.html" target="_top">Frames</a></li>
+<li><a href="TestOthers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestOthers" class="title">Uses of Class<br>test.TestOthers</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestOthers</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestOthers.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestOthers.html" target="_top">Frames</a></li>
+<li><a href="TestOthers.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestRestaurant.html b/doc/test/class-use/TestRestaurant.html
new file mode 100644
index 0000000..efea823
--- /dev/null
+++ b/doc/test/class-use/TestRestaurant.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class test.TestRestaurant</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestRestaurant";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestRestaurant.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestRestaurant.html" target="_top">Frames</a></li>
+<li><a href="TestRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestRestaurant" class="title">Uses of Class<br>test.TestRestaurant</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestRestaurant</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestRestaurant.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestRestaurant.html" target="_top">Frames</a></li>
+<li><a href="TestRestaurant.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestTargetProfitStrategy.html b/doc/test/class-use/TestTargetProfitStrategy.html
new file mode 100644
index 0000000..c3ae5de
--- /dev/null
+++ b/doc/test/class-use/TestTargetProfitStrategy.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class test.TestTargetProfitStrategy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestTargetProfitStrategy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestTargetProfitStrategy.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestTargetProfitStrategy" class="title">Uses of Class<br>test.TestTargetProfitStrategy</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestTargetProfitStrategy</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestTargetProfitStrategy.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestTargetProfitStrategy.html" target="_top">Frames</a></li>
+<li><a href="TestTargetProfitStrategy.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/TestUserFactory.html b/doc/test/class-use/TestUserFactory.html
new file mode 100644
index 0000000..7a51e1a
--- /dev/null
+++ b/doc/test/class-use/TestUserFactory.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:37 CEST 2017 -->
+<title>Uses of Class test.TestUserFactory</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.TestUserFactory";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestUserFactory.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestUserFactory.html" target="_top">Frames</a></li>
+<li><a href="TestUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.TestUserFactory" class="title">Uses of Class<br>test.TestUserFactory</h2>
+</div>
+<div class="classUseContainer">No usage of test.TestUserFactory</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/TestUserFactory.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/TestUserFactory.html" target="_top">Frames</a></li>
+<li><a href="TestUserFactory.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/class-use/main.html b/doc/test/class-use/main.html
index 4bad8f1..cfcf06a 100644
--- a/doc/test/class-use/main.html
+++ b/doc/test/class-use/main.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>Uses of Class test.main</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class test.main";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../test/main.html" title="class in test">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?test/class-use/main.html" target="_top">Frames</a></li>
-<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class test.main" class="title">Uses of Class<br>test.main</h2>
-</div>
-<div class="classUseContainer">No usage of test.main</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../../test/main.html" title="class in test">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-files/index-1.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?test/class-use/main.html" target="_top">Frames</a></li>
-<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>Uses of Class test.main</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class test.main";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/main.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/main.html" target="_top">Frames</a></li>
+<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class test.main" class="title">Uses of Class<br>test.main</h2>
+</div>
+<div class="classUseContainer">No usage of test.main</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../test/main.html" title="class in test">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?test/class-use/main.html" target="_top">Frames</a></li>
+<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/main.html b/doc/test/main.html
index 595945f..fbdacf2 100644
--- a/doc/test/main.html
+++ b/doc/test/main.html
@@ -1,271 +1,271 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>main</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="main";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/main.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/main.html" target="_top">Frames</a></li>
-<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">test</div>
-<h2 title="Class main" class="title">Class main</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>test.main</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">main</span>
-extends java.lang.Object</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../test/main.html#main--">main</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../test/main.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="main--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>main</h4>
-<pre>public&nbsp;main()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="main-java.lang.String:A-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/main.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/main.html" target="_top">Frames</a></li>
-<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
+<title>main</title>
+<meta name="date" content="2017-04-27">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="main";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/main.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/main.html" target="_top">Frames</a></li>
+<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">test</div>
+<h2 title="Class main" class="title">Class main</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>test.main</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">main</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../test/main.html#main--">main</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../test/main.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="main--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public&nbsp;main()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="main-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>main</h4>
+<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/main.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/main.html" target="_top">Frames</a></li>
+<li><a href="main.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/package-frame.html b/doc/test/package-frame.html
index 15fec93..a032823 100644
--- a/doc/test/package-frame.html
+++ b/doc/test/package-frame.html
@@ -1,20 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>test</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../test/package-summary.html" target="classFrame">test</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="main.html" title="class in test" target="classFrame">main</a></li>
-</ul>
-</div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>test</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../test/package-summary.html" target="classFrame">test</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="TestCard.html" title="class in test" target="classFrame">TestCard</a></li>
+<li><a href="TestCli.html" title="class in test" target="classFrame">TestCli</a></li>
+<li><a href="TestCore.html" title="class in test" target="classFrame">TestCore</a></li>
+<li><a href="TestCourier.html" title="class in test" target="classFrame">TestCourier</a></li>
+<li><a href="TestCustomer.html" title="class in test" target="classFrame">TestCustomer</a></li>
+<li><a href="TestDeliveryStrategy.html" title="class in test" target="classFrame">TestDeliveryStrategy</a></li>
+<li><a href="TestException.html" title="class in test" target="classFrame">TestException</a></li>
+<li><a href="TestItem.html" title="class in test" target="classFrame">TestItem</a></li>
+<li><a href="TestManager.html" title="class in test" target="classFrame">TestManager</a></li>
+<li><a href="TestOffers.html" title="class in test" target="classFrame">TestOffers</a></li>
+<li><a href="TestOrder.html" title="class in test" target="classFrame">TestOrder</a></li>
+<li><a href="TestOthers.html" title="class in test" target="classFrame">TestOthers</a></li>
+<li><a href="TestRestaurant.html" title="class in test" target="classFrame">TestRestaurant</a></li>
+<li><a href="TestTargetProfitStrategy.html" title="class in test" target="classFrame">TestTargetProfitStrategy</a></li>
+<li><a href="TestUserFactory.html" title="class in test" target="classFrame">TestUserFactory</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/doc/test/package-summary.html b/doc/test/package-summary.html
index d883727..231b79f 100644
--- a/doc/test/package-summary.html
+++ b/doc/test/package-summary.html
@@ -1,142 +1,198 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>test</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="test";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../User/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;test</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../test/main.html" title="class in test">main</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../User/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>test</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="test";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../User/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;test</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestCard.html" title="class in test">TestCard</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestCli.html" title="class in test">TestCli</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestCore.html" title="class in test">TestCore</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestCourier.html" title="class in test">TestCourier</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestCustomer.html" title="class in test">TestCustomer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestDeliveryStrategy.html" title="class in test">TestDeliveryStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestException.html" title="class in test">TestException</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestItem.html" title="class in test">TestItem</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestManager.html" title="class in test">TestManager</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestOffers.html" title="class in test">TestOffers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestOrder.html" title="class in test">TestOrder</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestOthers.html" title="class in test">TestOthers</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestRestaurant.html" title="class in test">TestRestaurant</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../test/TestTargetProfitStrategy.html" title="class in test">TestTargetProfitStrategy</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../test/TestUserFactory.html" title="class in test">TestUserFactory</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-use.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../User/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/package-tree.html b/doc/test/package-tree.html
index f7f6148..89bc4b9 100644
--- a/doc/test/package-tree.html
+++ b/doc/test/package-tree.html
@@ -1,137 +1,151 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:25 CEST 2017 -->
-<title>test Class Hierarchy</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="test Class Hierarchy";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/package-tree.html">Prev</a></li>
-<li><a href="../User/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package test</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">test.<a href="../test/main.html" title="class in test"><span class="typeNameLink">main</span></a></li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../StrategyProfit/package-tree.html">Prev</a></li>
-<li><a href="../User/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:34 CEST 2017 -->
+<title>test Class Hierarchy</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="test Class Hierarchy";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/package-tree.html">Prev</a></li>
+<li><a href="../User/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package test</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">test.<a href="../test/TestCard.html" title="class in test"><span class="typeNameLink">TestCard</span></a></li>
+<li type="circle">test.<a href="../test/TestCli.html" title="class in test"><span class="typeNameLink">TestCli</span></a></li>
+<li type="circle">test.<a href="../test/TestCore.html" title="class in test"><span class="typeNameLink">TestCore</span></a></li>
+<li type="circle">test.<a href="../test/TestCourier.html" title="class in test"><span class="typeNameLink">TestCourier</span></a></li>
+<li type="circle">test.<a href="../test/TestCustomer.html" title="class in test"><span class="typeNameLink">TestCustomer</span></a></li>
+<li type="circle">test.<a href="../test/TestDeliveryStrategy.html" title="class in test"><span class="typeNameLink">TestDeliveryStrategy</span></a></li>
+<li type="circle">test.<a href="../test/TestException.html" title="class in test"><span class="typeNameLink">TestException</span></a></li>
+<li type="circle">test.<a href="../test/TestItem.html" title="class in test"><span class="typeNameLink">TestItem</span></a></li>
+<li type="circle">test.<a href="../test/TestManager.html" title="class in test"><span class="typeNameLink">TestManager</span></a></li>
+<li type="circle">test.<a href="../test/TestOffers.html" title="class in test"><span class="typeNameLink">TestOffers</span></a></li>
+<li type="circle">test.<a href="../test/TestOrder.html" title="class in test"><span class="typeNameLink">TestOrder</span></a></li>
+<li type="circle">test.<a href="../test/TestOthers.html" title="class in test"><span class="typeNameLink">TestOthers</span></a></li>
+<li type="circle">test.<a href="../test/TestRestaurant.html" title="class in test"><span class="typeNameLink">TestRestaurant</span></a></li>
+<li type="circle">test.<a href="../test/TestTargetProfitStrategy.html" title="class in test"><span class="typeNameLink">TestTargetProfitStrategy</span></a></li>
+<li type="circle">test.<a href="../test/TestUserFactory.html" title="class in test"><span class="typeNameLink">TestUserFactory</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../StrategyProfit/package-tree.html">Prev</a></li>
+<li><a href="../User/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/doc/test/package-use.html b/doc/test/package-use.html
index 2ee1252..aa0f959 100644
--- a/doc/test/package-use.html
+++ b/doc/test/package-use.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="fr">
-<head>
-<!-- Generated by javadoc (1.8.0_121) on Thu Apr 27 10:47:26 CEST 2017 -->
-<title>Uses of Package test</title>
-<meta name="date" content="2017-04-27">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package test";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package test" class="title">Uses of Package<br>test</h1>
-</div>
-<div class="contentContainer">No usage of test</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-files/index-1.html">Index</a></li>
-<li><a href="../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?test/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="fr">
+<head>
+<!-- Generated by javadoc (1.8.0_121) on Sat May 06 22:43:41 CEST 2017 -->
+<title>Uses of Package test</title>
+<meta name="date" content="2017-05-06">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Package test";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Uses of Package test" class="title">Uses of Package<br>test</h1>
+</div>
+<div class="contentContainer">No usage of test</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li><a href="../index-files/index-1.html">Index</a></li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../index.html?test/package-use.html" target="_top">Frames</a></li>
+<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/scenario/my_foodora.ini b/scenario/my_foodora.ini
index dd2dacb..378a1af 100644
--- a/scenario/my_foodora.ini
+++ b/scenario/my_foodora.ini
@@ -1,80 +1,80 @@
-# initial login
-
-login ceo 123456789
-
-###############
-# Registering Users
-###############
-
-registerManager 698697556 cto cto cto@mail.fr 987654321 0.0,0.0 22/03/1985
-
-registerRestaurant 350697523 AuBonResto resto1 mail@mail.fr resto1pwd 0.02,0.03
-registerRestaurant 350697523 LaBonneBouffe resto2 mail@mail.fr resto2pwd -0.50,0.25
-registerRestaurant 350697523 AuCarreIrlandais resto3 mail@mail.fr resto3pwd 0.02,-0.3
-registerRestaurant 350697523 CafeDeLaPaix resto4 mail@mail.fr resto4pwd 23.2,-0.03
-registerRestaurant 350697523 Lolivier resto5 mail@mail.fr resto5pwd 0.02,0.36
-
-registerCourier 649878446 Marc cour_marc marc@mail.fr marc_pwd 0.9,-9.0 22/03/1975
-registerCourier 498784515 Henri cour_henri henri@mail.fr henri_pwd -0.9,-9.0 12/09/1989
-registerCourier 498484516 Luc cour_luc henri@mail.fr luc_pwd 0.9,19.0 27/12/1995
-
-registerCustomer 943684597 Louise custo_louise louise@mail.fr louise_pwd 5.3,9.1 23/02/1994
-registerCustomer 465131879 Jean custo_jean jean@mail.fr jean_pwd 3.3,-9.1 18/11/1985
-registerCustomer 648451648 Patrick custo_patrick patrick@mail.fr patrick_pwd 4.3,-3.1 12/02/1998
-registerCustomer 198745487 Mathieu custo_mathieu mathieu@mail.fr mathieu_pwd -8.3,-0.1 28/13/1958
-registerCustomer 877887446 Etienne custo_etienne etienne@mail.fr etienne_pwd -6.3,-6.1 21/12/1980
-registerCustomer 489446548 Jeanne custo_jeanne jeanne@mail.fr jeanne_pwd 7.3,-3.1 03/08/1989
-registerCustomer 489546844 Marie custo_marie marie@mail.fr marie_pwd 12.3,1.9 21/01/1997
-
-###############
-# Switching to restaurant
-###############
-
-logout
-
-login resto1 resto1pwd
-
-###############
-# Adding Dishes
-###############
-
-addDishRestaurantMenu steackFrites MainDish normal 14.50
-addDishRestaurantMenu salad Starter vegetarian 5.80
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
-addDishRestaurantMenu tartare Starter glutenFree 8.50
-addDishRestaurantMenu brownie Dessert normal 14.50
-addDishRestaurantMenu fruits Dessert vegetarian 4.50
-
-###############
-# Creating Menus
-###############
-
-createMeal menuEnfant FullMeal
-createMeal menuBoucher FullMeal
-createMeal menuVegetarien FullMeal
-createMeal menuDuMidi FullMeal
-createMeal menuLeger HalfMeal
-
-###############
-# Adding Menus to Meals
-###############
-
-addDishToMeal steackFrites menuEnfant
-addDishToMeal salad menuEnfant
-addDishToMeal cookie menuEnfant
-
-addDishToMeal tartare menuBoucher
-addDishToMeal steackFrites menuBoucher
-addDishToMeal brownie menuBoucher
-
-addDishToMeal salad menuVegetarien
-addDishToMeal mushroomPie menuVegetarien
-addDishToMeal fruits menuVegetarien
-
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-
-addDishToMeal salad menuLeger
+# initial login
+
+login ceo 123456789
+
+###############
+# Registering Users
+###############
+
+registerManager 698697556 cto cto cto@mail.fr 987654321 0.0,0.0 22/03/1985
+
+registerRestaurant 350697523 AuBonResto resto1 mail@mail.fr resto1pwd 0.02,0.03
+registerRestaurant 350697523 LaBonneBouffe resto2 mail@mail.fr resto2pwd -0.50,0.25
+registerRestaurant 350697523 AuCarreIrlandais resto3 mail@mail.fr resto3pwd 0.02,-0.3
+registerRestaurant 350697523 CafeDeLaPaix resto4 mail@mail.fr resto4pwd 23.2,-0.03
+registerRestaurant 350697523 Lolivier resto5 mail@mail.fr resto5pwd 0.02,0.36
+
+registerCourier 649878446 Marc cour_marc marc@mail.fr marc_pwd 0.9,-9.0 22/03/1975
+registerCourier 498784515 Henri cour_henri henri@mail.fr henri_pwd -0.9,-9.0 12/09/1989
+registerCourier 498484516 Luc cour_luc henri@mail.fr luc_pwd 90.2,19.0 27/12/1995
+
+registerCustomer 943684597 Louise custo_louise louise@mail.fr louise_pwd 5.3,-9.1 23/02/1994
+registerCustomer 465131879 Jean custo_jean jean@mail.fr jean_pwd 3.3,-9.1 18/11/1985
+registerCustomer 648451648 Patrick custo_patrick patrick@mail.fr patrick_pwd 4.3,-3.1 12/02/1998
+registerCustomer 198745487 Mathieu custo_mathieu mathieu@mail.fr mathieu_pwd -8.3,-0.1 28/13/1958
+registerCustomer 877887446 Etienne custo_etienne etienne@mail.fr etienne_pwd -6.3,-6.1 21/12/1980
+registerCustomer 489446548 Jeanne custo_jeanne jeanne@mail.fr jeanne_pwd 7.3,-3.1 03/08/1989
+registerCustomer 489546844 Marie custo_marie marie@mail.fr marie_pwd 12.3,1.9 21/01/1997
+
+###############
+# Switching to restaurant
+###############
+
+logout
+
+login resto1 resto1pwd
+
+###############
+# Adding Dishes
+###############
+
+addDishRestaurantMenu steackFrites MainDish normal 14.50
+addDishRestaurantMenu salad Starter vegetarian 5.80
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
+addDishRestaurantMenu tartare Starter glutenFree 8.50
+addDishRestaurantMenu brownie Dessert normal 14.50
+addDishRestaurantMenu fruits Dessert vegetarian 4.50
+
+###############
+# Creating Menus
+###############
+
+createMeal menuEnfant FullMeal
+createMeal menuBoucher FullMeal
+createMeal menuVegetarien FullMeal
+createMeal menuDuMidi FullMeal
+createMeal menuLeger HalfMeal
+
+###############
+# Adding Menus to Meals
+###############
+
+addDishToMeal steackFrites menuEnfant
+addDishToMeal salad menuEnfant
+addDishToMeal cookie menuEnfant
+
+addDishToMeal tartare menuBoucher
+addDishToMeal steackFrites menuBoucher
+addDishToMeal brownie menuBoucher
+
+addDishToMeal salad menuVegetarien
+addDishToMeal mushroomPie menuVegetarien
+addDishToMeal fruits menuVegetarien
+
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+
+addDishToMeal salad menuLeger
 addDishToMeal mushroomPie menuLeger
\ No newline at end of file
diff --git a/scenario/testScenario1.txt b/scenario/testScenario1.txt
index 45cd71f..d6e6c32 100644
--- a/scenario/testScenario1.txt
+++ b/scenario/testScenario1.txt
@@ -1,267 +1,268 @@
-###############
-# showing users
-###############
-
-login ceo 123456789
-
-showCustomer
-showCourier
-showRestaurantTop
-
-###############
-# register a few more users
-###############
-
-registerRestaurant 123756753 LaSalleHaute resto6 resto6@mail.fr resto6pwd 2.02,-1.03
-registerRestaurant 789321345 AuBistrot resto7 resto7@mail.fr resto7pwd -5.50,3.25
-
-registerCourier 123786541 Lucie cour_lucie lucie@mail.fr lucie_pwd 1.5,-2.0 23/03/1998
-# registerCourier 789534123 Alexandre cour_alexandre alexandre@mail.fr alexandre_pwd -0.8,2.1 14/05/1982
-registerCourier 789534123 Pascal cour_pascal pascal@mail.fr pascal_pwd -0.8,2.1 14/05/1978
-
-registerCustomer 943684597 Jacques custo_jacques jacques@mail.fr jacques_pwd 2.3,-9.8 23/02/1975
-registerCustomer 465131879 Gabrielle custo_gabrielle gabrielle@mail.fr gabrielle_pwd -3.3,2.1 18/03/1987
-
-# show restaurants
-showRestaurantTop
-
-# show customers
-showCustomer
-
-# logout
-logout
-
-###############
-# login, adding and populate a meal to each restaurant
-# 5 uniques Full meals
-# 2 uniques Half meals
-###############
-
-
-login resto2 resto2pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.80
-addDishRestaurantMenu salad Starter vegetarian 5.20
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
-addDishRestaurantMenu tartare Starter glutenFree 9.50
-addDishRestaurantMenu brownie Dessert normal 12.50
-addDishRestaurantMenu fruits Dessert vegetarian 6.50
-createMeal menuEnfant FullMeal
-addDishToMeal steackFrites menuEnfant
-addDishToMeal salad menuEnfant
-addDishToMeal cookie menuEnfant
-createMeal menuDuMidi FullMeal
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-createMeal menuLegerEntreePlat HalfMeal
-addDishToMeal salad menuLegerEntreePlat
-addDishToMeal mushroomPie menuLegerEntreePlat
-
-# login implies logout of the current logged entity
-login resto3 resto3pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.80
-addDishRestaurantMenu salad Starter vegetarian 5.20
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
-addDishRestaurantMenu tartare Starter glutenFree 9.50
-addDishRestaurantMenu brownie Dessert normal 12.50
-addDishRestaurantMenu fruits Dessert vegetarian 6.50
-createMeal menuBoucher FullMeal
-addDishToMeal tartare menuBoucher
-addDishToMeal steackFrites menuBoucher
-addDishToMeal brownie menuBoucher
-createMeal menuDuMidi FullMeal
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-createMeal menuLegerEntreePlat HalfMeal
-addDishToMeal salad menuLegerEntreePlat
-addDishToMeal mushroomPie menuLegerEntreePlat
-
-login resto4 resto4pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.80
-addDishRestaurantMenu salad Starter vegetarian 5.20
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
-addDishRestaurantMenu tartare Starter glutenFree 9.50
-addDishRestaurantMenu brownie Dessert normal 12.50
-addDishRestaurantMenu fruits Dessert vegetarian 6.50
-createMeal menuVegetarien FullMeal
-addDishToMeal salad menuVegetarien
-addDishToMeal mushroomPie menuVegetarien
-addDishToMeal fruits menuVegetarien
-createMeal menuDuMidi FullMeal
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-
-login resto5 resto5pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.50
-addDishRestaurantMenu salad Starter vegetarian 5.80
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
-addDishRestaurantMenu tartare Starter glutenFree 7.60
-addDishRestaurantMenu brownie Dessert normal 12.30
-addDishRestaurantMenu fruits Dessert vegetarian 6.50
-createMeal menuDuMidi FullMeal
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-createMeal menuLegerEntreePlat HalfMeal
-addDishToMeal salad menuLegerEntreePlat
-addDishToMeal mushroomPie menuLegerEntreePlat
-
-login resto6 resto6pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.50
-addDishRestaurantMenu salad Starter vegetarian 5.80
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
-addDishRestaurantMenu tartare Starter glutenFree 8.50
-addDishRestaurantMenu brownie Dessert normal 14.50
-addDishRestaurantMenu fruits Dessert vegetarian 4.50
-createMeal menuLegerPlatDessert HalfMeal
-addDishToMeal mushroomPie menuLegerPlatDessert
-addDishToMeal cookie menuLegerPlatDessert
-createMeal menuDuMidi FullMeal
-addDishToMeal salad menuDuMidi
-addDishToMeal steackFrites menuDuMidi
-addDishToMeal cookie menuDuMidi
-
-login resto7 resto7pwd
-addDishRestaurantMenu steackFrites MainDish normal 14.80
-addDishRestaurantMenu salad Starter vegetarian 5.20
-addDishRestaurantMenu cookie Dessert normal 3.00
-addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
-addDishRestaurantMenu tartare Starter glutenFree 8.50
-addDishRestaurantMenu brownie Dessert normal 14.50
-addDishRestaurantMenu fruits Dessert vegetarian 4.50
-createMeal menuLegerEntreePlat HalfMeal
-addDishToMeal salad menuLegerEntreePlat
-addDishToMeal mushroomPie menuLegerEntreePlat
-
-###############
-# setting meal of the week for some restaurant (2,3,5,6)
-###############
-
-# !!!!!
-# Offers are stocked for each customer, waiting for connection to spam.
-# !!!!!
-
-login resto2 resto2pwd
-setSpecialOffer menuEnfant
-
-login resto3 resto3pwd
-setSpecialOffer menuDuMidi
-
-login resto5 resto5pwd
-setSpecialOffer menuLegerEntreePlat
-
-login resto6 resto6pwd
-setSpecialOffer menuLegerPlatDessert
-
-# Show all the restaurant and their menu :
-
-login ceo 123456789
-showRestaurantTop
-
-# Before testing command let's add afidelity card :
-
-associateCard custo_gabrielle Point
-associateCard custo_louise Lottery
-
-# Login a few customers
-
-login custo_jacques jacques_pwd
-# login implies logout of the current logged entity
-login custo_gabrielle gabrielle_pwd
-login custo_louise louise_pwd
-
-createOrder resto6 maCommande
-addItemToOrder maCommande menuDuMidi
-addItemToOrder maCommande salad
-addItemToOrder maCommande menuLegerPlatDessert
-
-endOrder maCommande
-
-login custo_gabrielle gabrielle_pwd
-
-createOrder resto5 maCommande2
-addItemToOrder maCommande2 menuDuMidi
-addItemToOrder maCommande2 cookie
-addItemToOrder maCommande2 menuLegerEntreePlat
-
-endOrder maCommande2
-
-#########"
-# Meal Of the week accuracy
-### resto 2 & 3 & 4 have exactly the same prices, menuMidi is meal of the week for resto3
-
-createOrder resto4 maCommande3
-createOrder resto3 maCommande4
-createOrder resto2 maCommande5
-# 5% reduc
-addItemToOrder maCommande3 menuDuMidi
-# 10% reduc
-addItemToOrder maCommande4 menuDuMidi
-# full price
-addItemToOrder maCommande5 salad
-addItemToOrder maCommande5 steackFrites
-addItemToOrder maCommande5 cookie
-
-endOrder maCommande5
-endOrder maCommande3
-endOrder maCommande4
-
-# last order, to test profit calculation
-
-createOrder resto2 maCommande6
-addItemToOrder maCommande6 menuDuMidi
-addItemToOrder maCommande6 menuLegerEntreePlat
-addItemToOrder maCommande6 cookie
-
-# at this point no courier available
-endOrderAt maCommande6 05/04/2017
-login ceo 123456789
-# free a courier
-offDuty cour_pascal
-login custo_gabrielle gabrielle_pwd
-
-endOrderAt maCommande6 05/04/2017
-
-# login again manager
-
-login ceo 123456789
-
-# initial profit
-showTotalProfit
-
-# set a markup profit strategy
-setProfitPolicy markup 6.0
-showTotalProfit
-
-# set a serviceFee strategy
-setProfitPolicy ServiceFee 5.0
-showTotalProfit
-
-setProfitPolicy deliveryCost 3.0
-showTotalProfit
-showProfitBetween 01/05/2017 10/05/2017
-
-showCourier
-showCourierOrdered ASC
-showCourierOrdered DESC
-
-###########
-# other stuff :
-###########
-
-# onDuty & offDuty
-offDuty cour_marc
-showCourier
-onDuty cour_marc
-showCourier
-
-showCustomer
-
+###############
+# need my_foodora.ini to be launched before
+# showing users
+###############
+
+login ceo 123456789
+
+showCustomer
+showCourier
+showRestaurantTop
+
+###############
+# register a few more users
+###############
+
+registerRestaurant 123756753 LaSalleHaute resto6 resto6@mail.fr resto6pwd 2.02,-1.03
+registerRestaurant 789321345 AuBistrot resto7 resto7@mail.fr resto7pwd -5.50,3.25
+
+registerCourier 123786541 Lucie cour_lucie lucie@mail.fr lucie_pwd 1.5,-2.0 23/03/1998
+# registerCourier 789534123 Alexandre cour_alexandre alexandre@mail.fr alexandre_pwd -0.8,2.1 14/05/1982
+registerCourier 789534123 Pascal cour_pascal pascal@mail.fr pascal_pwd -0.8,2.1 14/05/1978
+
+registerCustomer 943684597 Jacques custo_jacques jacques@mail.fr jacques_pwd 2.3,-9.8 23/02/1975
+registerCustomer 465131879 Gabrielle custo_gabrielle gabrielle@mail.fr gabrielle_pwd -3.3,2.1 18/03/1987
+
+# show restaurants
+showRestaurantTop
+
+# show customers
+showCustomer
+
+# logout
+logout
+
+###############
+# login, adding and populate a meal to each restaurant
+# 5 uniques Full meals
+# 2 uniques Half meals
+###############
+
+
+login resto2 resto2pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.80
+addDishRestaurantMenu salad Starter vegetarian 5.20
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
+addDishRestaurantMenu tartare Starter glutenFree 9.50
+addDishRestaurantMenu brownie Dessert normal 12.50
+addDishRestaurantMenu fruits Dessert vegetarian 6.50
+createMeal menuEnfant FullMeal
+addDishToMeal steackFrites menuEnfant
+addDishToMeal salad menuEnfant
+addDishToMeal cookie menuEnfant
+createMeal menuDuMidi FullMeal
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+createMeal menuLegerEntreePlat HalfMeal
+addDishToMeal salad menuLegerEntreePlat
+addDishToMeal mushroomPie menuLegerEntreePlat
+
+# login implies logout of the current logged entity
+login resto3 resto3pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.80
+addDishRestaurantMenu salad Starter vegetarian 5.20
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
+addDishRestaurantMenu tartare Starter glutenFree 9.50
+addDishRestaurantMenu brownie Dessert normal 12.50
+addDishRestaurantMenu fruits Dessert vegetarian 6.50
+createMeal menuBoucher FullMeal
+addDishToMeal tartare menuBoucher
+addDishToMeal steackFrites menuBoucher
+addDishToMeal brownie menuBoucher
+createMeal menuDuMidi FullMeal
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+createMeal menuLegerEntreePlat HalfMeal
+addDishToMeal salad menuLegerEntreePlat
+addDishToMeal mushroomPie menuLegerEntreePlat
+
+login resto4 resto4pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.80
+addDishRestaurantMenu salad Starter vegetarian 5.20
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
+addDishRestaurantMenu tartare Starter glutenFree 9.50
+addDishRestaurantMenu brownie Dessert normal 12.50
+addDishRestaurantMenu fruits Dessert vegetarian 6.50
+createMeal menuVegetarien FullMeal
+addDishToMeal salad menuVegetarien
+addDishToMeal mushroomPie menuVegetarien
+addDishToMeal fruits menuVegetarien
+createMeal menuDuMidi FullMeal
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+
+login resto5 resto5pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.50
+addDishRestaurantMenu salad Starter vegetarian 5.80
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
+addDishRestaurantMenu tartare Starter glutenFree 7.60
+addDishRestaurantMenu brownie Dessert normal 12.30
+addDishRestaurantMenu fruits Dessert vegetarian 6.50
+createMeal menuDuMidi FullMeal
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+createMeal menuLegerEntreePlat HalfMeal
+addDishToMeal salad menuLegerEntreePlat
+addDishToMeal mushroomPie menuLegerEntreePlat
+
+login resto6 resto6pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.50
+addDishRestaurantMenu salad Starter vegetarian 5.80
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 12.50
+addDishRestaurantMenu tartare Starter glutenFree 8.50
+addDishRestaurantMenu brownie Dessert normal 14.50
+addDishRestaurantMenu fruits Dessert vegetarian 4.50
+createMeal menuLegerPlatDessert HalfMeal
+addDishToMeal mushroomPie menuLegerPlatDessert
+addDishToMeal cookie menuLegerPlatDessert
+createMeal menuDuMidi FullMeal
+addDishToMeal salad menuDuMidi
+addDishToMeal steackFrites menuDuMidi
+addDishToMeal cookie menuDuMidi
+
+login resto7 resto7pwd
+addDishRestaurantMenu steackFrites MainDish normal 14.80
+addDishRestaurantMenu salad Starter vegetarian 5.20
+addDishRestaurantMenu cookie Dessert normal 3.00
+addDishRestaurantMenu mushroomPie MainDish vegetarian 11.50
+addDishRestaurantMenu tartare Starter glutenFree 8.50
+addDishRestaurantMenu brownie Dessert normal 14.50
+addDishRestaurantMenu fruits Dessert vegetarian 4.50
+createMeal menuLegerEntreePlat HalfMeal
+addDishToMeal salad menuLegerEntreePlat
+addDishToMeal mushroomPie menuLegerEntreePlat
+
+###############
+# setting meal of the week for some restaurant (2,3,5,6)
+###############
+
+# !!!!!
+# Offers are stocked for each customer, waiting for connection to spam.
+# !!!!!
+
+login resto2 resto2pwd
+setSpecialOffer menuEnfant
+
+login resto3 resto3pwd
+setSpecialOffer menuDuMidi
+
+login resto5 resto5pwd
+setSpecialOffer menuLegerEntreePlat
+
+login resto6 resto6pwd
+setSpecialOffer menuLegerPlatDessert
+
+# Show all the restaurant and their menu :
+
+login ceo 123456789
+showRestaurantTop
+
+# Before testing command let's add afidelity card :
+
+associateCard custo_gabrielle Point
+associateCard custo_louise Lottery
+
+# Login a few customers
+
+login custo_jacques jacques_pwd
+# login implies logout of the current logged entity
+login custo_gabrielle gabrielle_pwd
+login custo_louise louise_pwd
+
+createOrder resto6 maCommande
+addItemToOrder maCommande menuDuMidi
+addItemToOrder maCommande salad
+addItemToOrder maCommande menuLegerPlatDessert
+
+endOrder maCommande
+
+login custo_gabrielle gabrielle_pwd
+
+createOrder resto5 maCommande2
+addItemToOrder maCommande2 menuDuMidi
+addItemToOrder maCommande2 cookie
+addItemToOrder maCommande2 menuLegerEntreePlat
+
+endOrder maCommande2
+
+#########"
+# Meal Of the week accuracy
+### resto 2 & 3 & 4 have exactly the same prices, menuMidi is meal of the week for resto3
+
+createOrder resto4 maCommande3
+createOrder resto3 maCommande4
+createOrder resto2 maCommande5
+# 5% reduc
+addItemToOrder maCommande3 menuDuMidi
+# 10% reduc
+addItemToOrder maCommande4 menuDuMidi
+# full price
+addItemToOrder maCommande5 salad
+addItemToOrder maCommande5 steackFrites
+addItemToOrder maCommande5 cookie
+
+endOrder maCommande5
+endOrder maCommande3
+endOrder maCommande4
+
+# last order, to test profit calculation
+
+createOrder resto2 maCommande6
+addItemToOrder maCommande6 menuDuMidi
+addItemToOrder maCommande6 menuLegerEntreePlat
+addItemToOrder maCommande6 cookie
+
+# at this point no courier available
+endOrderAt maCommande6 05/04/2017
+login ceo 123456789
+# free a courier
+offDuty cour_pascal
+login custo_gabrielle gabrielle_pwd
+
+endOrderAt maCommande6 05/04/2017
+
+# login again manager
+
+login ceo 123456789
+
+# initial profit
+showTotalProfit
+
+# set a markup profit strategy
+setProfitPolicy markup 6.0
+showTotalProfit
+
+# set a serviceFee strategy
+setProfitPolicy ServiceFee 5.0
+showTotalProfit
+
+setProfitPolicy deliveryCost 3.0
+showTotalProfit
+showProfitBetween 01/05/2017 10/05/2017
+
+showCourier
+showCourierOrdered ASC
+showCourierOrdered DESC
+
+###########
+# other stuff :
+###########
+
+# onDuty & offDuty
+offDuty cour_marc
+showCourier
+onDuty cour_marc
+showCourier
+
+showCustomer
+
 logout
\ No newline at end of file
diff --git a/src/Cards/BasicFidelityCard.java b/src/Cards/BasicFidelityCard.java
index 1ba1f7c..726445f 100644
--- a/src/Cards/BasicFidelityCard.java
+++ b/src/Cards/BasicFidelityCard.java
@@ -1,5 +1,12 @@
 package Cards;
 
+/**
+ * Basic Card, by default attached to the client, no point, no lottery.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class BasicFidelityCard extends FidelityCard implements VisitableCard {
 
 
diff --git a/src/Cards/FidelityCard.java b/src/Cards/FidelityCard.java
index 48783c9..f564cd1 100644
--- a/src/Cards/FidelityCard.java
+++ b/src/Cards/FidelityCard.java
@@ -1,7 +1,13 @@
 package Cards;
 
 import Others.IDCard;
-import User.IDUser;
+
+/**
+ * FidelityCard abstract class.
+ *
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
 
 public abstract class FidelityCard implements VisitableCard {
 	
diff --git a/src/Cards/LotteryFidelityCard.java b/src/Cards/LotteryFidelityCard.java
index 9fc7558..990732c 100644
--- a/src/Cards/LotteryFidelityCard.java
+++ b/src/Cards/LotteryFidelityCard.java
@@ -1,5 +1,12 @@
 package Cards;
 
+/**
+ * Allow the user to win a free meal, it have a $percentage chance to win this meal.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class LotteryFidelityCard extends FidelityCard implements VisitableCard {
 	
 	private double percentage;
diff --git a/src/Cards/PointFidelityCard.java b/src/Cards/PointFidelityCard.java
index 373e2e9..13d31b4 100644
--- a/src/Cards/PointFidelityCard.java
+++ b/src/Cards/PointFidelityCard.java
@@ -1,5 +1,13 @@
 package Cards;
 
+/**
+ * 
+ * Each time a customer buy a meal, he win a point, this allow reduction or free meals.
+ *
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class PointFidelityCard extends FidelityCard implements VisitableCard {
 	
 	
diff --git a/src/Cli/Clui.java b/src/Cli/Clui.java
index 2a6e3e7..810152d 100644
--- a/src/Cli/Clui.java
+++ b/src/Cli/Clui.java
@@ -1,151 +1,159 @@
-package Cli;
-
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import Commands.Login;
-import Commands.AddDishRestaurantMenu;
-import Commands.AddDishToMeal;
-import Commands.AddItemToOrder;
-import Commands.AssociateCard;
-import Commands.CreateMeal;
-import Commands.CreateOrder;
-import Commands.EndOrder;
-import Commands.EndOrderAt;
-import Commands.Help;
-import Commands.Logout;
-import Commands.OffDuty;
-import Commands.OnDuty;
-import Commands.RegisterCourier;
-import Commands.RegisterCustomer;
-import Commands.RegisterManager;
-import Commands.RegisterRestaurant;
-import Commands.RemoveSpecialOffer;
-import Commands.RenameMeal;
-import Commands.RunTest;
-import Commands.SetDeliveryPolicy;
-import Commands.SetProfitPolicy;
-import Commands.SetSpecialOffer;
-import Commands.ShowCourier;
-import Commands.ShowCourierOrdered;
-import Commands.ShowCustomer;
-import Commands.ShowMeal;
-import Commands.ShowMenuItem;
-import Commands.ShowProfitBetween;
-import Commands.ShowRestaurantTop;
-import Commands.ShowTotalProfit;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import User.Customer;
-
-public class Clui {
-	
-	private MyFoodora foodora;
-	private ActiveUserContext activeUser;
-	private ArrayList<Command> listOfCommand = new ArrayList<Command>();
-	
-	
-	public Clui(MyFoodora _foodora, ActiveUserContext _activeUser) {
-		super();
-		this.foodora = _foodora;
-		this.activeUser = _activeUser;
-		this.listOfCommand.add(new AddDishRestaurantMenu());
-		this.listOfCommand.add(new AddDishToMeal());
-		this.listOfCommand.add(new RegisterCourier());
-		this.listOfCommand.add(new AddItemToOrder());
-		this.listOfCommand.add(new AssociateCard());
-		this.listOfCommand.add(new CreateMeal());
-		this.listOfCommand.add(new CreateOrder());
-		this.listOfCommand.add(new EndOrder());
-		this.listOfCommand.add(new EndOrderAt());
-		this.listOfCommand.add(new Help());
-		this.listOfCommand.add(new Login());
-		this.listOfCommand.add(new Logout());
-		this.listOfCommand.add(new OffDuty());
-		this.listOfCommand.add(new OnDuty());
-		this.listOfCommand.add(new RegisterCourier());
-		this.listOfCommand.add(new RegisterCustomer());
-		this.listOfCommand.add(new RegisterManager());
-		this.listOfCommand.add(new RegisterRestaurant());
-		this.listOfCommand.add(new RemoveSpecialOffer());
-		this.listOfCommand.add(new RenameMeal());
-		this.listOfCommand.add(new RunTest());
-		this.listOfCommand.add(new SetDeliveryPolicy());
-		this.listOfCommand.add(new SetProfitPolicy());
-		this.listOfCommand.add(new SetSpecialOffer());
-		this.listOfCommand.add(new ShowCourier());
-		this.listOfCommand.add(new ShowCourierOrdered());
-		this.listOfCommand.add(new ShowCustomer());
-		this.listOfCommand.add(new ShowMeal());
-		this.listOfCommand.add(new ShowMenuItem());
-		this.listOfCommand.add(new ShowProfitBetween());
-		this.listOfCommand.add(new ShowRestaurantTop());
-		this.listOfCommand.add(new ShowTotalProfit());
-	}
-
-	public Command getCommand(String commandName) {
-		for(Command c : this.listOfCommand){
-			if(c.isOneWanted(commandName))
-				return c;
-		}
-		return null;
-	}
-
-	public void executeCommand(String command){
-		if(!(command.equals("") || command.substring(0, 1).equals("#"))){
-			StringTokenizer st = new StringTokenizer(command);
-			String commandName = st.nextToken();
-			ArrayList<String> arguments = new ArrayList<String>();
-			while (st.hasMoreTokens()) {
-				arguments.add(st.nextToken());
-		    }
-			
-			Command commandAsked;
-			commandAsked = getCommand(commandName);
-			if(commandAsked != null){
-				try{
-					if(commandAsked.isGoodArgument(arguments)){
-						try {
-							commandAsked.execute(arguments, foodora, activeUser);
-						} catch (NumberFormatException | ExceptionUnknownMealType | ExceptionUnknownDishType
-								| ExceptionUnknownStartegyType | ExceptionUnknownTypeOfUser | java.lang.NullPointerException e) {
-							// TODO Auto-generated catch block
-							System.out.println("ERROR with command "+commandName+ " : " + e.getMessage());
-							//e.printStackTrace();
-						}
-					}else{
-						System.out.println("Error in the arguments.");
-					}
-				}catch (errorWrongNumberOfParams ex) {
-				     System.out.println(ex);
-				}
-				catch (errorWrongFormatValue ex) {
-				     System.out.println(ex);
-				}
-			}else{
-				System.out.println("Unknown command.");
-			}
-			
-			// lifeTimeFunction
-			if(activeUser.getUser() instanceof Customer){
-				Customer c = (Customer) activeUser.getUser();
-				c.checkForPendingOffer();
-			}
-			
-		}
-	}
-	
-	public void launchClui(){
-		System.out.println("Welcome to MyFoodora system, type help <> in order to have all the possible commands");
-		while(true){
-			String command = Input.string("===================\n"
-										+ "Type your command : ");
-			executeCommand(command);
-		}
-	}
-	
-}
+package Cli;
+
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import Commands.Login;
+import Commands.AddDishRestaurantMenu;
+import Commands.AddDishToMeal;
+import Commands.AddItemToOrder;
+import Commands.AssociateCard;
+import Commands.CreateMeal;
+import Commands.CreateOrder;
+import Commands.EndOrder;
+import Commands.EndOrderAt;
+import Commands.Help;
+import Commands.Logout;
+import Commands.OffDuty;
+import Commands.OnDuty;
+import Commands.RegisterCourier;
+import Commands.RegisterCustomer;
+import Commands.RegisterManager;
+import Commands.RegisterRestaurant;
+import Commands.RemoveSpecialOffer;
+import Commands.RenameMeal;
+import Commands.RunTest;
+import Commands.SetDeliveryPolicy;
+import Commands.SetProfitPolicy;
+import Commands.SetSpecialOffer;
+import Commands.ShowCourier;
+import Commands.ShowCourierOrdered;
+import Commands.ShowCustomer;
+import Commands.ShowMeal;
+import Commands.ShowMenuItem;
+import Commands.ShowProfitBetween;
+import Commands.ShowRestaurantTop;
+import Commands.ShowTotalProfit;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import User.Customer;
+
+/**
+ * Clui controller, create a context allowing cli into foodora system.
+ * Each command is parsed, arguments are verified through regex and the number of argument.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ * 
+ */
+
+public class Clui {
+	
+	private MyFoodora foodora;
+	private ActiveUserContext activeUser;
+	private ArrayList<Command> listOfCommand = new ArrayList<Command>();
+	
+	
+	public Clui(MyFoodora _foodora, ActiveUserContext _activeUser) {
+		super();
+		this.foodora = _foodora;
+		this.activeUser = _activeUser;
+		this.listOfCommand.add(new AddDishRestaurantMenu());
+		this.listOfCommand.add(new AddDishToMeal());
+		this.listOfCommand.add(new RegisterCourier());
+		this.listOfCommand.add(new AddItemToOrder());
+		this.listOfCommand.add(new AssociateCard());
+		this.listOfCommand.add(new CreateMeal());
+		this.listOfCommand.add(new CreateOrder());
+		this.listOfCommand.add(new EndOrder());
+		this.listOfCommand.add(new EndOrderAt());
+		this.listOfCommand.add(new Help());
+		this.listOfCommand.add(new Login());
+		this.listOfCommand.add(new Logout());
+		this.listOfCommand.add(new OffDuty());
+		this.listOfCommand.add(new OnDuty());
+		this.listOfCommand.add(new RegisterCourier());
+		this.listOfCommand.add(new RegisterCustomer());
+		this.listOfCommand.add(new RegisterManager());
+		this.listOfCommand.add(new RegisterRestaurant());
+		this.listOfCommand.add(new RemoveSpecialOffer());
+		this.listOfCommand.add(new RenameMeal());
+		this.listOfCommand.add(new RunTest());
+		this.listOfCommand.add(new SetDeliveryPolicy());
+		this.listOfCommand.add(new SetProfitPolicy());
+		this.listOfCommand.add(new SetSpecialOffer());
+		this.listOfCommand.add(new ShowCourier());
+		this.listOfCommand.add(new ShowCourierOrdered());
+		this.listOfCommand.add(new ShowCustomer());
+		this.listOfCommand.add(new ShowMeal());
+		this.listOfCommand.add(new ShowMenuItem());
+		this.listOfCommand.add(new ShowProfitBetween());
+		this.listOfCommand.add(new ShowRestaurantTop());
+		this.listOfCommand.add(new ShowTotalProfit());
+	}
+
+	public Command getCommand(String commandName) {
+		for(Command c : this.listOfCommand){
+			if(c.isOneWanted(commandName))
+				return c;
+		}
+		return null;
+	}
+
+	public void executeCommand(String command){
+		if(!(command.equals("") || command.substring(0, 1).equals("#"))){
+			StringTokenizer st = new StringTokenizer(command);
+			String commandName = st.nextToken();
+			ArrayList<String> arguments = new ArrayList<String>();
+			while (st.hasMoreTokens()) {
+				arguments.add(st.nextToken());
+		    }
+			
+			Command commandAsked;
+			commandAsked = getCommand(commandName);
+			if(commandAsked != null){
+				try{
+					if(commandAsked.isGoodArgument(arguments)){
+						try {
+							commandAsked.execute(arguments, foodora, activeUser);
+						} catch (NumberFormatException | ExceptionUnknownMealType | ExceptionUnknownDishType
+								| ExceptionUnknownStartegyType | ExceptionUnknownTypeOfUser | java.lang.NullPointerException e) {
+							// TODO Auto-generated catch block
+							System.out.println("ERROR with command "+commandName+ " : " + e.getMessage());
+							//e.printStackTrace();
+						}
+					}else{
+						System.out.println("Error in the arguments.");
+					}
+				}catch (errorWrongNumberOfParams ex) {
+				     System.out.println(ex);
+				}
+				catch (errorWrongFormatValue ex) {
+				     System.out.println(ex);
+				}
+			}else{
+				System.out.println("Unknown command.");
+			}
+			
+			// lifeTimeFunction
+			if(activeUser.getUser() instanceof Customer){
+				Customer c = (Customer) activeUser.getUser();
+				c.checkForPendingOffer();
+			}
+			
+		}
+	}
+	
+	public void launchClui(){
+		System.out.println("Welcome to MyFoodora system, type help <> in order to have all the possible commands");
+		while(true){
+			String command = Input.string("===================\n"
+										+ "Type your command : ");
+			executeCommand(command);
+		}
+	}
+	
+}
diff --git a/src/Cli/Command.java b/src/Cli/Command.java
index a8683ea..bf4333e 100644
--- a/src/Cli/Command.java
+++ b/src/Cli/Command.java
@@ -1,44 +1,54 @@
-package Cli;
-
-import java.util.ArrayList;
-
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-
-public abstract class Command {
-	private String commandName;
-	private Token [] listOfArgs;
-	
-	public Command(String _commandName, Token [] _listOfArgs){
-		commandName = _commandName;
-		listOfArgs = _listOfArgs;
-	}
-	
-	public boolean isOneWanted(String firstToken){
-		if(firstToken.toLowerCase().equals(commandName.toLowerCase()))
-			return true;
-		return false;
-	}
-	
-	public boolean isGoodArgument(ArrayList<String> arguments) throws errorWrongNumberOfParams,errorWrongFormatValue{
-		if(arguments.size() != listOfArgs.length){
-			throw new errorWrongNumberOfParams("Error : "+ commandName +" : "+Integer.toString(arguments.size())+" parameter insteed of "+Integer.toString(listOfArgs.length));
-		}
-		int i = 0;
-		for (String arg : arguments) {
-			if(listOfArgs[i].isTockenCorrect(arg))
-				i++;
-			else
-				throw new errorWrongFormatValue("Error : "+ commandName +" : " + i + " arg is wrong format");
-		}
-		 // trow une erreur
-		return true;
-	}
-	
-	public abstract void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) throws ExceptionUnknownMealType, NumberFormatException, ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser;
-	
-}
+package Cli;
+
+import java.util.ArrayList;
+
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+
+/**
+ * Describes how all command are, composed by a commandName and a listOfArgs,
+ * It allow to verify if each argument is correct, and if all arguments are there.
+ * Commands execute should verify if the user is connected and have the good instance value
+ *  by using the ActiveUserContext variable.
+ *
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public abstract class Command {
+	private String commandName;
+	private Token [] listOfArgs;
+	
+	public Command(String _commandName, Token [] _listOfArgs){
+		commandName = _commandName;
+		listOfArgs = _listOfArgs;
+	}
+	
+	public boolean isOneWanted(String firstToken){
+		if(firstToken.toLowerCase().equals(commandName.toLowerCase()))
+			return true;
+		return false;
+	}
+	
+	public boolean isGoodArgument(ArrayList<String> arguments) throws errorWrongNumberOfParams,errorWrongFormatValue{
+		if(arguments.size() != listOfArgs.length){
+			throw new errorWrongNumberOfParams("Error : "+ commandName +" : "+Integer.toString(arguments.size())+" parameter insteed of "+Integer.toString(listOfArgs.length));
+		}
+		int i = 0;
+		for (String arg : arguments) {
+			if(listOfArgs[i].isTockenCorrect(arg))
+				i++;
+			else
+				throw new errorWrongFormatValue("Error : "+ commandName +" : " + i + " arg is wrong format");
+		}
+		 // trow une erreur
+		return true;
+	}
+	
+	public abstract void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) throws ExceptionUnknownMealType, NumberFormatException, ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser;
+	
+}
diff --git a/src/Cli/Confirm.java b/src/Cli/Confirm.java
deleted file mode 100644
index bfd3368..0000000
--- a/src/Cli/Confirm.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package Cli;
-
-import java.util.Scanner;
-
-public class Confirm {
-	
-	public static boolean text(String str){
-		Scanner reader = new Scanner(System.in);
-		System.out.println(str);
-		System.out.println("(Y)es/(N)o : ");
-		String answer = reader.nextLine();
-		if(answer=="y" || answer == "Y" || answer == "o" || answer == "O")
-			return true;
-		return false;
-	}
-}
diff --git a/src/Cli/Input.java b/src/Cli/Input.java
index e5486ab..521cd3c 100644
--- a/src/Cli/Input.java
+++ b/src/Cli/Input.java
@@ -1,17 +1,16 @@
-package Cli;
-
-import java.util.ArrayList;
-import java.util.Scanner;
-
-public class Input {
-	
-	public static String string(String question){
-		Scanner reader = new Scanner(System.in);
-		System.out.println(question);
-		//System.out.println("Type the name");
-		String string = "";
-		string = reader.nextLine();
-		return string;
-	}
-
-}
+package Cli;
+
+import java.util.Scanner;
+
+public class Input {
+	
+	public static String string(String question){
+		Scanner reader = new Scanner(System.in);
+		System.out.println(question);
+		//System.out.println("Type the name");
+		String string = "";
+		string = reader.nextLine();
+		return string;
+	}
+
+}
diff --git a/src/Cli/Token.java b/src/Cli/Token.java
index 740ada0..d8c9494 100644
--- a/src/Cli/Token.java
+++ b/src/Cli/Token.java
@@ -1,56 +1,64 @@
-package Cli;
-
-public class Token {
-
-	private TypeToken typeOfToken;
-	private String name;
-	private String value;
-	
-	public Token(TypeToken _typeOfToken, String _name){
-		typeOfToken = _typeOfToken;
-		name = _name;
-		value = "";
-	}
-	
-	public void setValue(String _value) throws errorWrongFormatValue{
-		if(isTockenCorrect(_value)){
-			value = _value;
-		}else{
-			throw new errorWrongFormatValue("Incorrect format for "+name+" arg."); 
-			/* si incorrect, throw une erreur qui doit �tre catch 
-			par la fonction au dessus (et on doit annuler la commande */
-		}
-	}
-	
-	public String getValue(){
-		return value;
-	}
-	
-	public boolean isTockenCorrect(String _value){
-		switch(typeOfToken){
-			case date:
-				if(_value.matches("\\d{2}/\\d{2}/\\d{4}"))
-					return true;
-				break;
-			case integer:
-				if(_value.matches("-?\\d+"))
-					return true;
-				break;
-			case position:
-				if(_value.matches("-?\\d+(\\.\\d+)\\,-?\\d+(\\.\\d+)?"))
-					return true;
-				break;
-			case decimal:
-				if(_value.matches("-?\\d+(\\.\\d+)?"))
-					return true;
-				break;
-			case str:
-				return true;
-		}
-		return false;
-	}
-	
-	public static enum TypeToken{
-		date,str,integer,decimal,position
-	}
-}
+package Cli;
+
+/**
+ * A token represent a container for an argument, each time a command is given,
+ * The Clui will try to match each argument in it's associated Token.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ * 
+ */
+
+public class Token {
+
+	private TypeToken typeOfToken;
+	private String name;
+	private String value;
+	
+	public Token(TypeToken _typeOfToken, String _name){
+		typeOfToken = _typeOfToken;
+		name = _name;
+		value = "";
+	}
+	
+	public void setValue(String _value) throws errorWrongFormatValue{
+		if(isTockenCorrect(_value)){
+			value = _value;
+		}else{
+			throw new errorWrongFormatValue("Incorrect format for "+name+" arg."); 
+			/* si incorrect, throw une erreur qui doit �tre catch 
+			par la fonction au dessus (et on doit annuler la commande */
+		}
+	}
+	
+	public String getValue(){
+		return value;
+	}
+	
+	public boolean isTockenCorrect(String _value){
+		switch(typeOfToken){
+			case date:
+				if(_value.matches("\\d{2}/\\d{2}/\\d{4}"))
+					return true;
+				break;
+			case integer:
+				if(_value.matches("-?\\d+"))
+					return true;
+				break;
+			case position:
+				if(_value.matches("-?\\d+(\\.\\d+)?\\,-?\\d+(\\.\\d+)?"))
+					return true;
+				break;
+			case decimal:
+				if(_value.matches("-?\\d+(\\.\\d+)?"))
+					return true;
+				break;
+			case str:
+				return true;
+		}
+		return false;
+	}
+	
+	public static enum TypeToken{
+		date,str,integer,decimal,position
+	}
+}
diff --git a/src/Cli/errorWrongFormatValue.java b/src/Cli/errorWrongFormatValue.java
index 0959034..fed6d87 100644
--- a/src/Cli/errorWrongFormatValue.java
+++ b/src/Cli/errorWrongFormatValue.java
@@ -1,34 +1,34 @@
-package Cli;
-
-public class errorWrongFormatValue extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7873997091472426895L;
-
-	public errorWrongFormatValue() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongFormatValue(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongFormatValue(Throwable arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongFormatValue(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongFormatValue(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
-		super(arg0, arg1, arg2, arg3);
-		// TODO Auto-generated constructor stub
-	}
-
-}
+package Cli;
+
+public class errorWrongFormatValue extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7873997091472426895L;
+
+	public errorWrongFormatValue() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongFormatValue(String arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongFormatValue(Throwable arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongFormatValue(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongFormatValue(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
+		super(arg0, arg1, arg2, arg3);
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/src/Cli/errorWrongNumberOfParams.java b/src/Cli/errorWrongNumberOfParams.java
index 4c18d3c..5dafcd3 100644
--- a/src/Cli/errorWrongNumberOfParams.java
+++ b/src/Cli/errorWrongNumberOfParams.java
@@ -1,34 +1,34 @@
-package Cli;
-
-public class errorWrongNumberOfParams extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3780895191640653344L;
-
-	public errorWrongNumberOfParams() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongNumberOfParams(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongNumberOfParams(Throwable arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongNumberOfParams(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongNumberOfParams(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
-		super(arg0, arg1, arg2, arg3);
-		// TODO Auto-generated constructor stub
-	}
-
-}
+package Cli;
+
+public class errorWrongNumberOfParams extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3780895191640653344L;
+
+	public errorWrongNumberOfParams() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongNumberOfParams(String arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongNumberOfParams(Throwable arg0) {
+		super(arg0);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongNumberOfParams(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongNumberOfParams(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
+		super(arg0, arg1, arg2, arg3);
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/src/Cli/errorWrongTypeOfUser.java b/src/Cli/errorWrongTypeOfUser.java
index b671be8..fedefe2 100644
--- a/src/Cli/errorWrongTypeOfUser.java
+++ b/src/Cli/errorWrongTypeOfUser.java
@@ -1,35 +1,35 @@
-package Cli;
-
-public class errorWrongTypeOfUser extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7904486798144733615L;
-
-	public errorWrongTypeOfUser() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongTypeOfUser(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongTypeOfUser(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongTypeOfUser(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public errorWrongTypeOfUser(String message, Throwable cause, boolean enableSuppression,
-			boolean writableStackTrace) {
-		super(message, cause, enableSuppression, writableStackTrace);
-		// TODO Auto-generated constructor stub
-	}
-
-}
+package Cli;
+
+public class errorWrongTypeOfUser extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7904486798144733615L;
+
+	public errorWrongTypeOfUser() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongTypeOfUser(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongTypeOfUser(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongTypeOfUser(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public errorWrongTypeOfUser(String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/src/Commands/AddDishRestaurantMenu.java b/src/Commands/AddDishRestaurantMenu.java
index be581f3..68799dc 100644
--- a/src/Commands/AddDishRestaurantMenu.java
+++ b/src/Commands/AddDishRestaurantMenu.java
@@ -1,41 +1,36 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Item.Dish;
-import Others.Adress;
-import User.Manager;
-import User.Restaurant;
-import User.User;
-
-public class AddDishRestaurantMenu extends Command {
-
-	public AddDishRestaurantMenu() {
-		super("addDishRestaurantMenu",
-				new Token[]{new Token(Token.TypeToken.integer,"dishName")
-						,new Token(Token.TypeToken.str,"dishCategory")
-						,new Token(Token.TypeToken.str,"foodCategory")
-						,new Token(Token.TypeToken.decimal,"unitPrice")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownDishType {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.addDish(arg.get(1), arg.get(0), arg.get(2), Double.parseDouble(arg.get(3)));
-			System.out.println("Dish added : " + r.getDishByName(arg.get(0)));
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import User.Restaurant;
+
+public class AddDishRestaurantMenu extends Command {
+
+	public AddDishRestaurantMenu() {
+		super("addDishRestaurantMenu",
+				new Token[]{new Token(Token.TypeToken.str,"dishName")
+						,new Token(Token.TypeToken.str,"dishCategory")
+						,new Token(Token.TypeToken.str,"foodCategory")
+						,new Token(Token.TypeToken.decimal,"unitPrice")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownDishType {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.addDish(arg.get(1), arg.get(0), arg.get(2), Double.parseDouble(arg.get(3)));
+			System.out.println("Dish added : " + r.getDishByName(arg.get(0)));
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/AddDishToMeal.java b/src/Commands/AddDishToMeal.java
index 7ea13a8..9cfc0fd 100644
--- a/src/Commands/AddDishToMeal.java
+++ b/src/Commands/AddDishToMeal.java
@@ -1,35 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import User.Restaurant;
-
-public class AddDishToMeal extends Command {
-
-	public AddDishToMeal() {
-		super("addDishToMeal",
-				new Token[]{new Token(Token.TypeToken.str,"dishName")
-						,new Token(Token.TypeToken.str,"mealName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.addDishToMeal(r.getDishByName(arg.get(0)),r.getMealByName(arg.get(1)));
-			System.out.println("You added "+arg.get(0)+" to "+arg.get(1));
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Restaurant;
+
+public class AddDishToMeal extends Command {
+
+	public AddDishToMeal() {
+		super("addDishToMeal",
+				new Token[]{new Token(Token.TypeToken.str,"dishName")
+						,new Token(Token.TypeToken.str,"mealName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.addDishToMeal(r.getDishByName(arg.get(0)),r.getMealByName(arg.get(1)));
+			System.out.println("You added "+arg.get(0)+" to "+arg.get(1));
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/AddItemToOrder.java b/src/Commands/AddItemToOrder.java
index b5417b3..8ec6fae 100644
--- a/src/Commands/AddItemToOrder.java
+++ b/src/Commands/AddItemToOrder.java
@@ -1,37 +1,37 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Order.Order;
-import User.Customer;
-
-public class AddItemToOrder extends Command {
-
-	public AddItemToOrder() {
-		super("addItemToOrder",
-				new Token[]{new Token(Token.TypeToken.str,"orderName"),
-							new Token(Token.TypeToken.str,"itemName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Customer){
-			Customer c = (Customer) activeUser.getUser();
-			Order o = c.getOrderByName(arg.get(0));
-			//System.out.println(c.getListOrder());
-			o.addItemByName(arg.get(1));
-			System.out.println(arg.get(1) + " added in "+arg.get(0)+".");
-		}else{
-			System.out.println("You need to be a logged Customer in order to access this function");
-		}
-	}
-
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Order.Order;
+import User.Customer;
+
+public class AddItemToOrder extends Command {
+
+	public AddItemToOrder() {
+		super("addItemToOrder",
+				new Token[]{new Token(Token.TypeToken.str,"orderName"),
+							new Token(Token.TypeToken.str,"itemName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Customer){
+			Customer c = (Customer) activeUser.getUser();
+			Order o = c.getOrderByName(arg.get(0));
+			//System.out.println(c.getListOrder());
+			o.addItemByName(arg.get(1));
+			System.out.println(arg.get(1) + " added in "+arg.get(0)+".");
+		}else{
+			System.out.println("You need to be a logged Customer in order to access this function");
+		}
+	}
+
+
+}
diff --git a/src/Commands/AssociateCard.java b/src/Commands/AssociateCard.java
index 873607b..cbdf67b 100644
--- a/src/Commands/AssociateCard.java
+++ b/src/Commands/AssociateCard.java
@@ -1,39 +1,35 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cards.FidelityCard;
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import User.Customer;
-import User.Manager;
-
-public class AssociateCard extends Command {
-
-	public AssociateCard() {
-		super("associateCard",
-				new Token[]{new Token(Token.TypeToken.str,"customerUsername"),
-							new Token(Token.TypeToken.str,"cardType")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			Customer c = (Customer) foodora.getUserByUsername(arg.get(0));
-			System.out.println("You are choosing a "+arg.get(1)+" card.");
-			c.registerFidelityPlan(arg.get(1));
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-}
-
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import User.Customer;
+import User.Manager;
+
+public class AssociateCard extends Command {
+
+	public AssociateCard() {
+		super("associateCard",
+				new Token[]{new Token(Token.TypeToken.str,"customerUsername"),
+							new Token(Token.TypeToken.str,"cardType")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Customer c = (Customer) foodora.getUserByUsername(arg.get(0));
+			System.out.println("You are choosing a "+arg.get(1)+" card.");
+			c.registerFidelityPlan(arg.get(1));
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+}
+
diff --git a/src/Commands/CreateMeal.java b/src/Commands/CreateMeal.java
index 62c3548..3da8b75 100644
--- a/src/Commands/CreateMeal.java
+++ b/src/Commands/CreateMeal.java
@@ -1,35 +1,35 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownMealType;
-import User.Restaurant;
-
-public class CreateMeal extends Command {
-
-	public CreateMeal() {
-		super("createMeal",
-				new Token[]{new Token(Token.TypeToken.str,"nameOfTheMeal"),
-							new Token(Token.TypeToken.str,"typeOfMeal")
-						}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws ExceptionUnknownMealType {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.createMeal(arg.get(0), arg.get(1));
-			System.out.println("Meal added : "+arg.get(0));
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownMealType;
+import User.Restaurant;
+
+public class CreateMeal extends Command {
+
+	public CreateMeal() {
+		super("createMeal",
+				new Token[]{new Token(Token.TypeToken.str,"nameOfTheMeal"),
+							new Token(Token.TypeToken.str,"typeOfMeal")
+						}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws ExceptionUnknownMealType {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.createMeal(arg.get(0), arg.get(1));
+			System.out.println("Meal added : "+arg.get(0));
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/CreateOrder.java b/src/Commands/CreateOrder.java
index 1e8f239..3bde5d7 100644
--- a/src/Commands/CreateOrder.java
+++ b/src/Commands/CreateOrder.java
@@ -1,36 +1,36 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Customer;
-import User.Restaurant;
-
-public class CreateOrder extends Command {
-
-	public CreateOrder() {
-		super("createOrder",
-				new Token[]{new Token(Token.TypeToken.str,"restaurantName"),
-							new Token(Token.TypeToken.str,"orderName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Customer){
-			Customer c = (Customer) activeUser.getUser();
-			Restaurant r = (Restaurant) foodora.getUserByUsername(arg.get(0));
-			c.createOrder(arg.get(1), r);
-			System.out.println(arg.get(1) + " created for "+arg.get(0)+".");
-		}else{
-			System.out.println("You need to be a logged Customer in order to access this function");
-		}
-	}
-
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Customer;
+import User.Restaurant;
+
+public class CreateOrder extends Command {
+
+	public CreateOrder() {
+		super("createOrder",
+				new Token[]{new Token(Token.TypeToken.str,"restaurantName"),
+							new Token(Token.TypeToken.str,"orderName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Customer){
+			Customer c = (Customer) activeUser.getUser();
+			Restaurant r = (Restaurant) foodora.getUserByUsername(arg.get(0));
+			c.createOrder(arg.get(1), r);
+			System.out.println(arg.get(1) + " created for "+arg.get(0)+".");
+		}else{
+			System.out.println("You need to be a logged Customer in order to access this function");
+		}
+	}
+
+
+}
diff --git a/src/Commands/EndOrder.java b/src/Commands/EndOrder.java
index eba1a55..eb93832 100644
--- a/src/Commands/EndOrder.java
+++ b/src/Commands/EndOrder.java
@@ -1,34 +1,31 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Order.Order;
-import User.Customer;
-
-public class EndOrder extends Command {
-
-	public EndOrder() {
-		super("endOrder",
-				new Token[]{new Token(Token.TypeToken.str,"orderName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Customer){
-			Customer c = (Customer) activeUser.getUser();
-			System.out.println("finalising the command : "+ arg.get(0));
-			c.placeOrder(c.getOrderByName(arg.get(0)), foodora);
-		}else{
-			System.out.println("You need to be a logged Customer in order to access this function");
-		}
-	}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Customer;
+
+public class EndOrder extends Command {
+
+	public EndOrder() {
+		super("endOrder",
+				new Token[]{new Token(Token.TypeToken.str,"orderName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Customer){
+			Customer c = (Customer) activeUser.getUser();
+			System.out.println("finalising the command : "+ arg.get(0));
+			c.placeOrder(c.getOrderByName(arg.get(0)), foodora);
+		}else{
+			System.out.println("You need to be a logged Customer in order to access this function");
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Commands/EndOrderAt.java b/src/Commands/EndOrderAt.java
index 14a6a10..59be8c0 100644
--- a/src/Commands/EndOrderAt.java
+++ b/src/Commands/EndOrderAt.java
@@ -1,44 +1,40 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Order.Order;
-import Others.Date;
-import User.Customer;
-
-public class EndOrderAt extends Command {
-
-	public EndOrderAt() {
-		super("endOrderAt",
-				new Token[]{new Token(Token.TypeToken.str,"orderName"),
-							new Token(Token.TypeToken.date,"orderDate")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Customer){
-			Customer c = (Customer) activeUser.getUser();
-			Order o = (Order) c.getOrderByName(arg.get(0));
-			String[] parts = arg.get(1).split("/");
-			int day = Integer.parseInt(parts[0]);
-			int month = Integer.parseInt(parts[1]);
-			int year = Integer.parseInt(parts[2]);
-			System.out.println("finalising the command : "+ arg.get(0) + ", the : "+arg.get(1));
-			c.placeOrder(o, foodora,new Date(year,month,day));
-			//System.out.println(foodora.getGlobalHistoric());
-		}else{
-			System.out.println("You need to be a logged Customer in order to access this function");
-		}
-	}
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Order.Order;
+import Others.Date;
+import User.Customer;
+
+public class EndOrderAt extends Command {
+
+	public EndOrderAt() {
+		super("endOrderAt",
+				new Token[]{new Token(Token.TypeToken.str,"orderName"),
+							new Token(Token.TypeToken.date,"orderDate")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Customer){
+			Customer c = (Customer) activeUser.getUser();
+			Order o = c.getOrderByName(arg.get(0));
+			String[] parts = arg.get(1).split("/");
+			int day = Integer.parseInt(parts[0]);
+			int month = Integer.parseInt(parts[1]);
+			int year = Integer.parseInt(parts[2]);
+			System.out.println("finalising the command : "+ arg.get(0) + ", the : "+arg.get(1));
+			c.placeOrder(o, foodora,new Date(year,month,day));
+			//System.out.println(foodora.getGlobalHistoric());
+		}else{
+			System.out.println("You need to be a logged Customer in order to access this function");
+		}
+	}
+}
diff --git a/src/Commands/FindDeliverer.java b/src/Commands/FindDeliverer.java
index 54424c2..802e885 100644
--- a/src/Commands/FindDeliverer.java
+++ b/src/Commands/FindDeliverer.java
@@ -1,36 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Order.Order;
-import User.Courier;
-import User.Manager;
-
-public class FindDeliverer extends Command {
-
-	public FindDeliverer() {
-		super("findDeliverer",
-				new Token[]{new Token(Token.TypeToken.str,"orderName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			Order o = foodora.getPendingOrderByName(arg.get(0));
-			Courier c = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(o.getRestaurantAttached(), foodora.getCustomerByOrder(o), foodora.getListCourier().getList());
-			System.out.println(c.toString());
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Order.Order;
+import User.Courier;
+import User.Manager;
+
+public class FindDeliverer extends Command {
+
+	public FindDeliverer() {
+		super("findDeliverer",
+				new Token[]{new Token(Token.TypeToken.str,"orderName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Order o = foodora.getPendingOrderByName(arg.get(0));
+			Courier c = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(o.getRestaurantAttached(), foodora.getCustomerByOrder(o), foodora.getListCourier().getList());
+			System.out.println(c.toString());
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+}
diff --git a/src/Commands/Help.java b/src/Commands/Help.java
index e4f7bc4..8e6cd7c 100644
--- a/src/Commands/Help.java
+++ b/src/Commands/Help.java
@@ -1,53 +1,53 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-
-public class Help extends Command {
-
-	public Help() {
-		super("help",
-				new Token[]{}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		System.out.println("Liste des commandes disponibles : \n"
-				+ "login <username> <password> : to allow a user to perform the login (remark: aMyfoodora manager user with username: ceo and password:123456789 is assumedto exist)\n"
-				+ "logout <> : to allow the currently logged on user to log off\n"
-				+ "registerRestaurant <name> <address> <username> <password> : for the cur-rently logged on manager to add a restaurant of given name, address (i.e. addressshould be a bi-dimensional co-ordinate), username and password to the system.\n"
-				+ "registerCustomer <firstName> <lastName> <username> <address> <password>: for the currently logged on manager to add a client to the system\n"
-				+ "registerCourier <firstName> <lastName> <username> <position> <password>: for the currently logged on manager to add a courier to the system (by default eachnewly registered courier is on-duty).\n"
-				+ "addDishRestauarantMenu <dishName> <dishCategory> <foodCategory> <unitPrice>: for the currently logged on restaurant to add a dish with given name, given cat-egory (starter,main,dessert), food type (standard,vegetarian, gluten-free) and priceto the menu of a restaurant with given name (this command can be executed by arestaurant-user only)\n"
-				+ "createMeal <mealName> : for the currently logged on restaurant to create a mealwith a given name\n"
-				+ "addDish2Meal <dishName> <mealName> : for the currently logged on restaurant toadd a dish to a meal\n"
-				+ "showMeal <mealName> : for the currently logged on restaurant to show the dishesin a meal with given name\n"
-				+ "saveMeal <mealName> : for the currently logged on restaurant to save a meal withgiven name\n"
-				+ "setSpecialOffer <mealName> : for the currently logged on restaurant to add ameal in meal-of-the-week special oer\n"
-				+ "removeFromSpecialOffer <mealName> : for the currently logged on restaurant toreset a special offer\n"
-				+ "createOrder <restaurantName> <orderName> : for the currently logged on cus-tomer to create an order from a given restaurant\n"
-				+ "addItem2Order <orderName> <itemName> : for the currently logged on customerto add an item (either a menu item or a meal-deal) to an existing order\n"
-				+ "endOrder <orderName> < date> : for the currently logged on customer to finalise an order at a given date and pay it\n"
-				+ "onDuty <username> : for the currently logged on courier to set his state as on-duty\n"
-				+ "offDuty <username> : for the currently logged on courier to set his state as off-duty\n"
-				+ "findDeliverer <orderName> : for the currently logged on restaurant to allocate anorder to a deliverer by application of the current delivery policy (remark: this is justan extra facility of the CLUI, that will allow us to test whether deliverer allocationworks properly. The actual allocation of a deliverer should be automatically triggeredby the system on completion of an order by a customer).\n"
-				+ "setDeliveryPolicy <delPolicyName> : for the currently logged on myFoodoramanager to set the delivery policy of the system to that passed as argument\n"
-				+ "setProfitPolicy <ProfitPolicyName> : for the currently logged on myFoodoramanager set the prot policy of the system to that passed as argument\n"
-				+ "associateCard <userName> <cardType> for the currently logged on myFoodoramanager to associate a delity card to a user with given namePage\n"
-				+ "showCourierDeliveries <> for the currently logged on myFoodora manager to dis-play the list of couriers sorted in decreasing order w.r.t. the number of completeddeliveries\n"
-				+ "showRestaurantTop <> for the currently logged on myFoodora manager to displaythe list of restaurant sorted in decreasing order w.r.t. the number of delivered orders\n"
-				+ "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-				+ "showMenuItem <restaurant-name> for the currently logged on myFoodora managerto display the menu of a given restaurant\n"
-				+ "showTotalProfit<> for the currently logged on myFoodora manager to show thetotal profit of the system since creation\n"
-				+ "showTotalProfit <startDate> <endDate> for the currently logged on myFoodoramanager to show the total prfit of the system within a time interval\n"
-				+ "runTest <testScenario-file> for a generic user of the CLUI (no need to login)to execute the list of CLUI commands contained in the testScenario le passed asargument\n"
-				+ "help <> for a generic user of the CLUI (no need to login) to display the list ofavailable CLUI commands (a command per line) with an indication of their syntax\n");
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+
+public class Help extends Command {
+
+	public Help() {
+		super("help",
+				new Token[]{}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		System.out.println("Liste des commandes disponibles : \n"
+				+ "login <username> <password> : to allow a user to perform the login (remark: aMyfoodora manager user with username: ceo and password:123456789 is assumedto exist)\n"
+				+ "logout <> : to allow the currently logged on user to log off\n"
+				+ "registerRestaurant <name> <address> <username> <password> : for the cur-rently logged on manager to add a restaurant of given name, address (i.e. addressshould be a bi-dimensional co-ordinate), username and password to the system.\n"
+				+ "registerCustomer <firstName> <lastName> <username> <address> <password>: for the currently logged on manager to add a client to the system\n"
+				+ "registerCourier <firstName> <lastName> <username> <position> <password>: for the currently logged on manager to add a courier to the system (by default eachnewly registered courier is on-duty).\n"
+				+ "addDishRestauarantMenu <dishName> <dishCategory> <foodCategory> <unitPrice>: for the currently logged on restaurant to add a dish with given name, given cat-egory (starter,main,dessert), food type (standard,vegetarian, gluten-free) and priceto the menu of a restaurant with given name (this command can be executed by arestaurant-user only)\n"
+				+ "createMeal <mealName> : for the currently logged on restaurant to create a mealwith a given name\n"
+				+ "addDish2Meal <dishName> <mealName> : for the currently logged on restaurant toadd a dish to a meal\n"
+				+ "showMeal <mealName> : for the currently logged on restaurant to show the dishesin a meal with given name\n"
+				+ "saveMeal <mealName> : for the currently logged on restaurant to save a meal withgiven name\n"
+				+ "setSpecialOffer <mealName> : for the currently logged on restaurant to add ameal in meal-of-the-week special oer\n"
+				+ "removeFromSpecialOffer <mealName> : for the currently logged on restaurant toreset a special offer\n"
+				+ "createOrder <restaurantName> <orderName> : for the currently logged on cus-tomer to create an order from a given restaurant\n"
+				+ "addItem2Order <orderName> <itemName> : for the currently logged on customerto add an item (either a menu item or a meal-deal) to an existing order\n"
+				+ "endOrder <orderName> < date> : for the currently logged on customer to finalise an order at a given date and pay it\n"
+				+ "onDuty <username> : for the currently logged on courier to set his state as on-duty\n"
+				+ "offDuty <username> : for the currently logged on courier to set his state as off-duty\n"
+				+ "findDeliverer <orderName> : for the currently logged on restaurant to allocate anorder to a deliverer by application of the current delivery policy (remark: this is justan extra facility of the CLUI, that will allow us to test whether deliverer allocationworks properly. The actual allocation of a deliverer should be automatically triggeredby the system on completion of an order by a customer).\n"
+				+ "setDeliveryPolicy <delPolicyName> : for the currently logged on myFoodoramanager to set the delivery policy of the system to that passed as argument\n"
+				+ "setProfitPolicy <ProfitPolicyName> : for the currently logged on myFoodoramanager set the prot policy of the system to that passed as argument\n"
+				+ "associateCard <userName> <cardType> for the currently logged on myFoodoramanager to associate a delity card to a user with given namePage\n"
+				+ "showCourierDeliveries <> for the currently logged on myFoodora manager to dis-play the list of couriers sorted in decreasing order w.r.t. the number of completeddeliveries\n"
+				+ "showRestaurantTop <> for the currently logged on myFoodora manager to displaythe list of restaurant sorted in decreasing order w.r.t. the number of delivered orders\n"
+				+ "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+				+ "showMenuItem <restaurant-name> for the currently logged on myFoodora managerto display the menu of a given restaurant\n"
+				+ "showTotalProfit<> for the currently logged on myFoodora manager to show thetotal profit of the system since creation\n"
+				+ "showTotalProfit <startDate> <endDate> for the currently logged on myFoodoramanager to show the total prfit of the system within a time interval\n"
+				+ "runTest <testScenario-file> for a generic user of the CLUI (no need to login)to execute the list of CLUI commands contained in the testScenario le passed asargument\n"
+				+ "help <> for a generic user of the CLUI (no need to login) to display the list ofavailable CLUI commands (a command per line) with an indication of their syntax\n");
+	}
+
+}
diff --git a/src/Commands/Login.java b/src/Commands/Login.java
index f276a64..5da66f6 100644
--- a/src/Commands/Login.java
+++ b/src/Commands/Login.java
@@ -1,33 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.User;
-
-
-public class Login extends Command {
-
-	public Login() {
-		super("login",
-				new Token[]{new Token(Token.TypeToken.str,"username"),new Token(Token.TypeToken.str,"password")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> args, MyFoodora foodora, ActiveUserContext activeUser) {
-		// TODO Auto-generated method stub
-		User user = foodora.getUserByLogin(args.get(0), args.get(1));
-		if(user == null)
-			System.out.println("Wrong username and/or password");
-		else{
-			System.out.println("Hi "+user.getName() +" !");
-			activeUser.setActiveUser(user);
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.User;
+
+
+public class Login extends Command {
+
+	public Login() {
+		super("login",
+				new Token[]{new Token(Token.TypeToken.str,"username"),new Token(Token.TypeToken.str,"password")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> args, MyFoodora foodora, ActiveUserContext activeUser) {
+		// TODO Auto-generated method stub
+		User user = foodora.getUserByLogin(args.get(0), args.get(1));
+		if(user == null)
+			System.out.println("Wrong username and/or password");
+		else{
+			System.out.println("Hi "+user.getName() +" !");
+			activeUser.setActiveUser(user);
+		}
+	}
+
+}
diff --git a/src/Commands/Logout.java b/src/Commands/Logout.java
index 307014a..7aea053 100644
--- a/src/Commands/Logout.java
+++ b/src/Commands/Logout.java
@@ -1,29 +1,29 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-
-public class Logout extends Command {
-
-	public Logout() {
-		super("logout",
-				new Token[]{}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser()==null){
-			System.out.println("Already disconnected.");
-		}else{
-			activeUser.setActiveUser(null);
-			System.out.println("Bye !");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+
+public class Logout extends Command {
+
+	public Logout() {
+		super("logout",
+				new Token[]{}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser()==null){
+			System.out.println("Already disconnected.");
+		}else{
+			activeUser.setActiveUser(null);
+			System.out.println("Bye !");
+		}
+	}
+
+}
diff --git a/src/Commands/OffDuty.java b/src/Commands/OffDuty.java
index 88fac86..029f7d2 100644
--- a/src/Commands/OffDuty.java
+++ b/src/Commands/OffDuty.java
@@ -1,36 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import User.Courier;
-import User.Manager;
-
-public class OffDuty extends Command {
-
-	public OffDuty() {
-		super("offDuty",
-				new Token[]{new Token(Token.TypeToken.str,"courierUsername")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			Courier d = (Courier) foodora.getUserByUsername(arg.get(0));
-			d.setAvailable(true);
-			System.out.println(arg.get(0) + " in now available.");
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Courier;
+import User.Manager;
+
+public class OffDuty extends Command {
+
+	public OffDuty() {
+		super("offDuty",
+				new Token[]{new Token(Token.TypeToken.str,"courierUsername")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Courier d = (Courier) foodora.getUserByUsername(arg.get(0));
+			d.setAvailable(true);
+			System.out.println(arg.get(0) + " in now available.");
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/src/Commands/OnDuty.java b/src/Commands/OnDuty.java
index 6d7c872..c24847e 100644
--- a/src/Commands/OnDuty.java
+++ b/src/Commands/OnDuty.java
@@ -1,37 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import User.Courier;
-import User.Customer;
-import User.Manager;
-
-public class OnDuty extends Command {
-
-	public OnDuty() {
-		super("onDuty",
-				new Token[]{new Token(Token.TypeToken.str,"courierUsername")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			Courier d = (Courier) foodora.getUserByUsername(arg.get(0));
-			d.setAvailable(false);
-			System.out.println(arg.get(0) + " in now on duty.");
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Courier;
+import User.Manager;
+
+public class OnDuty extends Command {
+
+	public OnDuty() {
+		super("onDuty",
+				new Token[]{new Token(Token.TypeToken.str,"courierUsername")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Courier d = (Courier) foodora.getUserByUsername(arg.get(0));
+			d.setAvailable(false);
+			System.out.println(arg.get(0) + " in now on duty.");
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RegisterCourier.java b/src/Commands/RegisterCourier.java
index 660b8a5..871a161 100644
--- a/src/Commands/RegisterCourier.java
+++ b/src/Commands/RegisterCourier.java
@@ -1,43 +1,42 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.Courier;
-import User.Manager;
-import User.User;
-
-public class RegisterCourier extends Command {
-
-	public RegisterCourier() {
-		super("registerCourier",
-				new Token[]{new Token(Token.TypeToken.integer,"tel")
-						,new Token(Token.TypeToken.str,"name")
-						,new Token(Token.TypeToken.str,"username")
-						,new Token(Token.TypeToken.str,"mail")
-						,new Token(Token.TypeToken.str,"password")
-						,new Token(Token.TypeToken.position,"adress")
-						,new Token(Token.TypeToken.date,"birthday")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			// registerCourier 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
-			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.COURIER , "Human");
-			System.out.println("Courier added : " + (Courier) foodora.getUserByUsername(arg.get(2)));
-		}else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Manager;
+import User.User;
+
+public class RegisterCourier extends Command {
+
+	public RegisterCourier() {
+		super("registerCourier",
+				new Token[]{new Token(Token.TypeToken.integer,"tel")
+						,new Token(Token.TypeToken.str,"name")
+						,new Token(Token.TypeToken.str,"username")
+						,new Token(Token.TypeToken.str,"mail")
+						,new Token(Token.TypeToken.str,"password")
+						,new Token(Token.TypeToken.position,"adress")
+						,new Token(Token.TypeToken.date,"birthday")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Manager m = (Manager) activeUser.getUser();
+			// registerCourier 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
+			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.COURIER , "Human");
+			System.out.println("Courier added : " + foodora.getUserByUsername(arg.get(2)));
+		}else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RegisterCustomer.java b/src/Commands/RegisterCustomer.java
index 99352b2..d7cc754 100644
--- a/src/Commands/RegisterCustomer.java
+++ b/src/Commands/RegisterCustomer.java
@@ -1,43 +1,42 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.Customer;
-import User.Manager;
-import User.User;
-
-public class RegisterCustomer extends Command {
-
-	public RegisterCustomer() {
-		super("registerCustomer",
-				new Token[]{new Token(Token.TypeToken.integer,"tel")
-						,new Token(Token.TypeToken.str,"name")
-						,new Token(Token.TypeToken.str,"username")
-						,new Token(Token.TypeToken.str,"mail")
-						,new Token(Token.TypeToken.str,"password")
-						,new Token(Token.TypeToken.position,"adress")
-						,new Token(Token.TypeToken.date,"birthday")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
-			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.CUSTOMER , "Human");
-			System.out.println("Customer added : " + (Customer) foodora.getUserByUsername( arg.get(2)));
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Manager;
+import User.User;
+
+public class RegisterCustomer extends Command {
+
+	public RegisterCustomer() {
+		super("registerCustomer",
+				new Token[]{new Token(Token.TypeToken.integer,"tel")
+						,new Token(Token.TypeToken.str,"name")
+						,new Token(Token.TypeToken.str,"username")
+						,new Token(Token.TypeToken.str,"mail")
+						,new Token(Token.TypeToken.str,"password")
+						,new Token(Token.TypeToken.position,"adress")
+						,new Token(Token.TypeToken.date,"birthday")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Manager m = (Manager) activeUser.getUser();
+			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
+			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.CUSTOMER , "Human");
+			System.out.println("Customer added : " + foodora.getUserByUsername( arg.get(2)));
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RegisterManager.java b/src/Commands/RegisterManager.java
index fa2657c..08951da 100644
--- a/src/Commands/RegisterManager.java
+++ b/src/Commands/RegisterManager.java
@@ -1,42 +1,42 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.Manager;
-import User.User;
-
-public class RegisterManager extends Command {
-
-	public RegisterManager() {
-		super("registerManager",
-				new Token[]{new Token(Token.TypeToken.integer,"tel")
-						,new Token(Token.TypeToken.str,"name")
-						,new Token(Token.TypeToken.str,"username")
-						,new Token(Token.TypeToken.str,"mail")
-						,new Token(Token.TypeToken.str,"password")
-						,new Token(Token.TypeToken.position,"adress")
-						,new Token(Token.TypeToken.date,"birthday")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
-			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.MANAGER , "Human");
-			System.out.println("Manager added : " + (Manager) foodora.getUserByUsername(arg.get(2)));
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Manager;
+import User.User;
+
+public class RegisterManager extends Command {
+
+	public RegisterManager() {
+		super("registerManager",
+				new Token[]{new Token(Token.TypeToken.integer,"tel")
+						,new Token(Token.TypeToken.str,"name")
+						,new Token(Token.TypeToken.str,"username")
+						,new Token(Token.TypeToken.str,"mail")
+						,new Token(Token.TypeToken.str,"password")
+						,new Token(Token.TypeToken.position,"adress")
+						,new Token(Token.TypeToken.date,"birthday")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Manager m = (Manager) activeUser.getUser();
+			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995
+			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, arg.get(6), "1", foodora, User.MANAGER , "Human");
+			System.out.println("Manager added : " + foodora.getUserByUsername(arg.get(2)));
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RegisterRestaurant.java b/src/Commands/RegisterRestaurant.java
index bb08018..0b2b62e 100644
--- a/src/Commands/RegisterRestaurant.java
+++ b/src/Commands/RegisterRestaurant.java
@@ -1,42 +1,41 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.Manager;
-import User.Restaurant;
-import User.User;
-
-public class RegisterRestaurant extends Command {
-
-	public RegisterRestaurant() {
-		super("registerRestaurant",
-				new Token[]{new Token(Token.TypeToken.integer,"tel")
-						,new Token(Token.TypeToken.str,"name")
-						,new Token(Token.TypeToken.str,"username")
-						,new Token(Token.TypeToken.str,"mail")
-						,new Token(Token.TypeToken.str,"password")
-						,new Token(Token.TypeToken.position,"adress")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02
-			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, "1", "1", foodora, User.RESTAURANT , "Moral");
-			System.out.println("Restaurant added : " + (Restaurant) foodora.getUserByUsername(arg.get(2)));
-		}else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Manager;
+import User.User;
+
+public class RegisterRestaurant extends Command {
+
+	public RegisterRestaurant() {
+		super("registerRestaurant",
+				new Token[]{new Token(Token.TypeToken.integer,"tel")
+						,new Token(Token.TypeToken.str,"name")
+						,new Token(Token.TypeToken.str,"username")
+						,new Token(Token.TypeToken.str,"mail")
+						,new Token(Token.TypeToken.str,"password")
+						,new Token(Token.TypeToken.position,"adress")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownTypeOfUser {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Manager m = (Manager) activeUser.getUser();
+			// registerRestaurant 0123456789 resto1 resto1 mail password 0.01,0.02
+			m.addUser(Long.parseLong(arg.get(0)), arg.get(1), arg.get(2), arg.get(3), arg.get(4), Adress.fromStr(arg.get(5)), true, "1", "1", foodora, User.RESTAURANT , "Moral");
+			System.out.println("Restaurant added : " + foodora.getUserByUsername(arg.get(2)));
+		}else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RemoveSpecialOffer.java b/src/Commands/RemoveSpecialOffer.java
index f49cafd..9e265e9 100644
--- a/src/Commands/RemoveSpecialOffer.java
+++ b/src/Commands/RemoveSpecialOffer.java
@@ -1,32 +1,32 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Restaurant;
-
-public class RemoveSpecialOffer extends Command {
-	
-	public RemoveSpecialOffer() {
-		super("removeSpecialOffer",
-				new Token[]{}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.removeMealOfTheWeek(foodora);
-			System.out.println("Meal Of The Week deleted.");
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Restaurant;
+
+public class RemoveSpecialOffer extends Command {
+	
+	public RemoveSpecialOffer() {
+		super("removeSpecialOffer",
+				new Token[]{}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.removeMealOfTheWeek(foodora);
+			System.out.println("Meal Of The Week deleted.");
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RenameMeal.java b/src/Commands/RenameMeal.java
index a6350a5..a616dba 100644
--- a/src/Commands/RenameMeal.java
+++ b/src/Commands/RenameMeal.java
@@ -1,35 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import User.Restaurant;
-
-public class RenameMeal extends Command {
-
-	public RenameMeal() {
-		super("renameMeal",
-				new Token[]{new Token(Token.TypeToken.str,"mealName"),
-						new Token(Token.TypeToken.str,"newName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.getMealByName(arg.get(0)).setName(arg.get(1));
-			System.out.println("Meal "+arg.get(0)+" renamed to "+arg.get(1));
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Restaurant;
+
+public class RenameMeal extends Command {
+
+	public RenameMeal() {
+		super("renameMeal",
+				new Token[]{new Token(Token.TypeToken.str,"mealName"),
+						new Token(Token.TypeToken.str,"newName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.getMealByName(arg.get(0)).setName(arg.get(1));
+			System.out.println("Meal "+arg.get(0)+" renamed to "+arg.get(1));
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/RunTest.java b/src/Commands/RunTest.java
index aee3333..aa4f5aa 100644
--- a/src/Commands/RunTest.java
+++ b/src/Commands/RunTest.java
@@ -1,44 +1,39 @@
-package Commands;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.stream.Stream;
-
-import Cli.Clui;
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import User.Manager;
-
-public class RunTest extends Command {
-
-	public RunTest() {
-		super("runTest",
-				new Token[]{new Token(Token.TypeToken.str,"file")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
-		Clui clui = new Clui(foodora, activeUser);
-		String fileName = System.getProperty("user.dir") + "/" + arg.get(0);
-
-		//read file into stream, try-with-resources
-		try (Stream<String> stream = Files.lines(Paths.get(fileName))) {
-			stream.forEach(command -> clui.executeCommand(command));
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-}
+package Commands;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.stream.Stream;
+
+import Cli.Clui;
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+
+public class RunTest extends Command {
+
+	public RunTest() {
+		super("runTest",
+				new Token[]{new Token(Token.TypeToken.str,"file")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
+		Clui clui = new Clui(foodora, activeUser);
+		String fileName = System.getProperty("user.dir") + "/" + arg.get(0);
+
+		//read file into stream, try-with-resources
+		try (Stream<String> stream = Files.lines(Paths.get(fileName))) {
+			stream.forEach(command -> clui.executeCommand(command));
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/Commands/SetDeliveryPolicy.java b/src/Commands/SetDeliveryPolicy.java
index 1b0b93f..1755f03 100644
--- a/src/Commands/SetDeliveryPolicy.java
+++ b/src/Commands/SetDeliveryPolicy.java
@@ -1,35 +1,32 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import User.Manager;
-
-public class SetDeliveryPolicy extends Command {
-
-	public SetDeliveryPolicy() {
-		super("setDeliveryPolicy",
-				new Token[]{new Token(Token.TypeToken.str,"deliveryPolicyName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			foodora.getContextDeliveryPolicy().setStrategy(arg.get(0));
-			System.out.println(arg.get(0) + " is now the delivery policy.");
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import User.Manager;
+
+public class SetDeliveryPolicy extends Command {
+
+	public SetDeliveryPolicy() {
+		super("setDeliveryPolicy",
+				new Token[]{new Token(Token.TypeToken.str,"deliveryPolicyName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			foodora.getContextDeliveryPolicy().setStrategy(arg.get(0));
+			System.out.println(arg.get(0) + " is now the delivery policy.");
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/SetProfitPolicy.java b/src/Commands/SetProfitPolicy.java
index ef1301f..677e9a8 100644
--- a/src/Commands/SetProfitPolicy.java
+++ b/src/Commands/SetProfitPolicy.java
@@ -1,37 +1,34 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import User.Manager;
-
-public class SetProfitPolicy extends Command {
-
-	public SetProfitPolicy() {
-		super("setProfitPolicy",
-				new Token[]{new Token(Token.TypeToken.str,"profityPolicyName"),
-							new Token(Token.TypeToken.decimal,"valueTargetted")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Manager m = (Manager) activeUser.getUser();
-			foodora.getContextTargetProfitStrategy().setStrategy(arg.get(0));
-			foodora.getContextTargetProfitStrategy().execute(foodora, Double.parseDouble(arg.get(1)));
-			System.out.println(arg.get(0) + " is now the profit policy, target is : "+arg.get(1)+".");
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import User.Manager;
+
+public class SetProfitPolicy extends Command {
+
+	public SetProfitPolicy() {
+		super("setProfitPolicy",
+				new Token[]{new Token(Token.TypeToken.str,"profityPolicyName"),
+							new Token(Token.TypeToken.decimal,"valueTargetted")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException, ExceptionUnknownStartegyType {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			foodora.getContextTargetProfitStrategy().setStrategy(arg.get(0));
+			foodora.getContextTargetProfitStrategy().execute(foodora, Double.parseDouble(arg.get(1)));
+			System.out.println(arg.get(0) + " is now the profit policy, target is : "+arg.get(1)+".");
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/SetSpecialOffer.java b/src/Commands/SetSpecialOffer.java
index 8bb0974..7565d63 100644
--- a/src/Commands/SetSpecialOffer.java
+++ b/src/Commands/SetSpecialOffer.java
@@ -1,32 +1,32 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Restaurant;
-
-public class SetSpecialOffer extends Command {
-
-	public SetSpecialOffer() {
-		super("setSpecialOffer",
-				new Token[]{new Token(Token.TypeToken.str,"mealName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			r.addMealOfTheWeek(foodora, arg.get(0));
-			System.out.println("Meal "+arg.get(0)+" is now the Meal Of The Week.");
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Restaurant;
+
+public class SetSpecialOffer extends Command {
+
+	public SetSpecialOffer() {
+		super("setSpecialOffer",
+				new Token[]{new Token(Token.TypeToken.str,"mealName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			r.addMealOfTheWeek(foodora, arg.get(0));
+			System.out.println("Meal "+arg.get(0)+" is now the Meal Of The Week.");
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowCourier.java b/src/Commands/ShowCourier.java
index 339d2af..4191f24 100644
--- a/src/Commands/ShowCourier.java
+++ b/src/Commands/ShowCourier.java
@@ -1,36 +1,33 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import User.Courier;
-import User.Manager;
-
-public class ShowCourier extends Command {
-
-	public ShowCourier() {
-		super("showCourier", new Token[]{});
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			System.out.println("\n*************\nlist of couriers :");
-			for(Courier c : foodora.getListCourier().getList()){
-				System.out.println(c.toString());
-			}
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Courier;
+import User.Manager;
+
+public class ShowCourier extends Command {
+
+	public ShowCourier() {
+		super("showCourier", new Token[]{});
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			System.out.println("\n*************\nlist of couriers :");
+			for(Courier c : foodora.getListCourier().getList()){
+				System.out.println(c.toString());
+			}
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowCourierOrdered.java b/src/Commands/ShowCourierOrdered.java
index a5dc0f2..d20e996 100644
--- a/src/Commands/ShowCourierOrdered.java
+++ b/src/Commands/ShowCourierOrdered.java
@@ -1,33 +1,29 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import User.Manager;
-
-public class ShowCourierOrdered extends Command {
-	
-	public ShowCourierOrdered() {
-		super("showCourierOrdered", new Token[]{new Token(Token.TypeToken.str,"typeOrdering")});
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			System.out.println("\n*************\nlist of couriers ordered by "+arg.get(0)+" : \n" + foodora.getListCourierOrdered(arg.get(0)).toString());
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Manager;
+
+public class ShowCourierOrdered extends Command {
+	
+	public ShowCourierOrdered() {
+		super("showCourierOrdered", new Token[]{new Token(Token.TypeToken.str,"typeOrdering")});
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			System.out.println("\n*************\nlist of couriers ordered by "+arg.get(0)+" : \n" + foodora.getListCourierOrdered(arg.get(0)).toString());
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowCustomer.java b/src/Commands/ShowCustomer.java
index ba4eab6..f3a66b1 100644
--- a/src/Commands/ShowCustomer.java
+++ b/src/Commands/ShowCustomer.java
@@ -1,36 +1,36 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Customer;
-import User.Manager;
-
-public class ShowCustomer extends Command {
-
-	public ShowCustomer() {
-		super("showCustomer", new Token[]{});
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			System.out.println("\n*************\nlist of customers :");
-			for(Customer c : foodora.getListCustomer().getList()){
-				System.out.println(c.toString());
-			}
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-		
-	}
-	
-	
-	
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Customer;
+import User.Manager;
+
+public class ShowCustomer extends Command {
+
+	public ShowCustomer() {
+		super("showCustomer", new Token[]{});
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			System.out.println("\n*************\nlist of customers :");
+			for(Customer c : foodora.getListCustomer().getList()){
+				System.out.println(c.toString());
+			}
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+		
+	}
+	
+	
+	
+}
diff --git a/src/Commands/ShowMeal.java b/src/Commands/ShowMeal.java
index f06a99b..177f79c 100644
--- a/src/Commands/ShowMeal.java
+++ b/src/Commands/ShowMeal.java
@@ -1,31 +1,31 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Restaurant;
-
-public class ShowMeal extends Command {
-
-	public ShowMeal() {
-		super("showMeal",
-				new Token[]{new Token(Token.TypeToken.str,"mealName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Restaurant){
-			Restaurant r = (Restaurant) activeUser.getUser();
-			System.out.println(r.getMealByName(arg.get(0)));
-		}else{
-			System.out.println("You need to be a logged Restaurant in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Restaurant;
+
+public class ShowMeal extends Command {
+
+	public ShowMeal() {
+		super("showMeal",
+				new Token[]{new Token(Token.TypeToken.str,"mealName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Restaurant){
+			Restaurant r = (Restaurant) activeUser.getUser();
+			System.out.println(r.getMealByName(arg.get(0)));
+		}else{
+			System.out.println("You need to be a logged Restaurant in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowMenuItem.java b/src/Commands/ShowMenuItem.java
index 42e1179..7d127bc 100644
--- a/src/Commands/ShowMenuItem.java
+++ b/src/Commands/ShowMenuItem.java
@@ -1,37 +1,32 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Order.Order;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class ShowMenuItem extends Command {
-
-	public ShowMenuItem() {
-		super("showMenuItem",
-				new Token[]{new Token(Token.TypeToken.str,"restaurantName")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
-		// TODO Auto-generated method stub
-		if(activeUser.getUser() instanceof Manager){
-			Restaurant r = (Restaurant) foodora.getUserByUsername(arg.get(0));
-			System.out.println("List of Dishs : \n" + r.getListOfDish().toString() + "\n===========\nList of Meals : " + r.getListOfMeal().toString());
-		}else{
-			System.out.println("You need to be a logged Manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Manager;
+import User.Restaurant;
+
+public class ShowMenuItem extends Command {
+
+	public ShowMenuItem() {
+		super("showMenuItem",
+				new Token[]{new Token(Token.TypeToken.str,"restaurantName")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) throws NumberFormatException {
+		// TODO Auto-generated method stub
+		if(activeUser.getUser() instanceof Manager){
+			Restaurant r = (Restaurant) foodora.getUserByUsername(arg.get(0));
+			System.out.println("List of Dishs : \n" + r.getListOfDish().toString() + "\n===========\nList of Meals : " + r.getListOfMeal().toString());
+		}else{
+			System.out.println("You need to be a logged Manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowProfitBetween.java b/src/Commands/ShowProfitBetween.java
index 51694b7..36200b1 100644
--- a/src/Commands/ShowProfitBetween.java
+++ b/src/Commands/ShowProfitBetween.java
@@ -1,36 +1,36 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Manager;
-
-public class ShowProfitBetween extends Command {
-
-	public ShowProfitBetween() {
-		super("showProfitBetween",
-				new Token[]{new Token(Token.TypeToken.str,"dateBeg"),
-							new Token(Token.TypeToken.str,"dateEnd")}
-		);
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			String[] db = arg.get(0).split("/");
-			String[] de = arg.get(1).split("/");
-			Others.Date dateBeg = new Others.Date(Integer.parseInt(db[2]), Integer.parseInt(db[1]), Integer.parseInt(db[0]));
-			Others.Date dateEnd = new Others.Date(Integer.parseInt(de[2]), Integer.parseInt(de[1]), Integer.parseInt(de[0]));
-			System.out.println("Total profit between "+dateBeg+" and "+ dateEnd +" : " + foodora.getProfitBetween(dateBeg, dateEnd));
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Manager;
+
+public class ShowProfitBetween extends Command {
+
+	public ShowProfitBetween() {
+		super("showProfitBetween",
+				new Token[]{new Token(Token.TypeToken.str,"dateBeg"),
+							new Token(Token.TypeToken.str,"dateEnd")}
+		);
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arg, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			String[] db = arg.get(0).split("/");
+			String[] de = arg.get(1).split("/");
+			Others.Date dateBeg = new Others.Date(Integer.parseInt(db[2]), Integer.parseInt(db[1]), Integer.parseInt(db[0]));
+			Others.Date dateEnd = new Others.Date(Integer.parseInt(de[2]), Integer.parseInt(de[1]), Integer.parseInt(de[0]));
+			System.out.println("Total profit between "+dateBeg+" and "+ dateEnd +" : " + foodora.getProfitBetween(dateBeg, dateEnd));
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/ShowRestaurantTop.java b/src/Commands/ShowRestaurantTop.java
index 9318d5b..8ff9d6c 100644
--- a/src/Commands/ShowRestaurantTop.java
+++ b/src/Commands/ShowRestaurantTop.java
@@ -1,50 +1,50 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import User.Manager;
-import User.Restaurant;
-
-public class ShowRestaurantTop extends Command {
-
-	public ShowRestaurantTop() {
-		super("showRestaurantTop", new Token[]{});
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			ArrayList<Restaurant> sortListOfRestaurant = new ArrayList<Restaurant>();
-			ArrayList<Restaurant> listOfRestaurant = foodora.getListRestaurant().getList();
-			ArrayList<Restaurant> listToSort = new ArrayList<Restaurant>();
-			for(Restaurant restaurant : listOfRestaurant){
-				listToSort.add(restaurant);
-			}
-			while(listToSort.isEmpty() == false){
-				long maxNbOfSell = 0;
-				Restaurant mostSeller = null;
-				for(Restaurant r : listToSort){
-					if(r.getHistoricOrder().getListOrder().size() >= maxNbOfSell){
-						mostSeller = r;
-						maxNbOfSell = r.getHistoricOrder().getListOrder().size();
-					}
-				}
-				sortListOfRestaurant.add(mostSeller);
-				listToSort.remove(mostSeller);
-			}
-			
-			System.out.println("\n*************\nlist of restaurants :" + sortListOfRestaurant.toString());
-			
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-		
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Manager;
+import User.Restaurant;
+
+public class ShowRestaurantTop extends Command {
+
+	public ShowRestaurantTop() {
+		super("showRestaurantTop", new Token[]{});
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			ArrayList<Restaurant> sortListOfRestaurant = new ArrayList<Restaurant>();
+			ArrayList<Restaurant> listOfRestaurant = foodora.getListRestaurant().getList();
+			ArrayList<Restaurant> listToSort = new ArrayList<Restaurant>();
+			for(Restaurant restaurant : listOfRestaurant){
+				listToSort.add(restaurant);
+			}
+			while(listToSort.isEmpty() == false){
+				long maxNbOfSell = 0;
+				Restaurant mostSeller = null;
+				for(Restaurant r : listToSort){
+					if(r.getHistoricOrder().getListOrder().size() >= maxNbOfSell){
+						mostSeller = r;
+						maxNbOfSell = r.getHistoricOrder().getListOrder().size();
+					}
+				}
+				sortListOfRestaurant.add(mostSeller);
+				listToSort.remove(mostSeller);
+			}
+			
+			System.out.println("\n*************\nlist of restaurants :" + sortListOfRestaurant.toString());
+			
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+		
+	}
+
+}
diff --git a/src/Commands/ShowTotalProfit.java b/src/Commands/ShowTotalProfit.java
index d50a55f..ce951da 100644
--- a/src/Commands/ShowTotalProfit.java
+++ b/src/Commands/ShowTotalProfit.java
@@ -1,32 +1,29 @@
-package Commands;
-
-import java.util.ArrayList;
-
-import Cli.Command;
-import Cli.Token;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import User.Manager;
-
-public class ShowTotalProfit extends Command {
-
-	public ShowTotalProfit() {
-		super("showTotalProfit", new Token[]{});
-		// TODO Auto-generated constructor stub
-	}
-	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
-
-	@Override
-	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
-		if(activeUser.getUser() instanceof Manager){
-			System.out.println("Total profit since the begining : " + foodora.getGlobalProfit());
-		}
-		else{
-			System.out.println("You need to be a manager in order to access this function");
-		}
-	}
-
-}
+package Commands;
+
+import java.util.ArrayList;
+
+import Cli.Command;
+import Cli.Token;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import User.Manager;
+
+public class ShowTotalProfit extends Command {
+
+	public ShowTotalProfit() {
+		super("showTotalProfit", new Token[]{});
+		// TODO Auto-generated constructor stub
+	}
+	// + "showCustomers <> for the currently logged on myFoodora manager to display thelist of customers\n"
+
+	@Override
+	public void execute(ArrayList<String> arguments, MyFoodora foodora, ActiveUserContext activeUser) {
+		if(activeUser.getUser() instanceof Manager){
+			System.out.println("Total profit since the begining : " + foodora.getGlobalProfit());
+		}
+		else{
+			System.out.println("You need to be a manager in order to access this function");
+		}
+	}
+
+}
diff --git a/src/Commands/model.di b/src/Commands/model.di
deleted file mode 100644
index bf9abab..0000000
--- a/src/Commands/model.di
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/src/Commands/model.notation b/src/Commands/model.notation
deleted file mode 100644
index cf3b4a4..0000000
--- a/src/Commands/model.notation
+++ /dev/null
@@ -1,2276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AN9ZEBVKEeeMzp7YIeMZtw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_td6vkBVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkhVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkxVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_td6vlBVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vlRVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vlhVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vlxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vmBVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vmRVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vmhVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vmxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vnBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vnRVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vnhVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vnxVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6voBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6voRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vohVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6voxVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_tdw-kBVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vkRVLEeeMzp7YIeMZtw" x="2399" y="1088"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_3Heq0RVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq0xVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq1BVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Heq1RVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq1hVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq1xVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq2BVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq2RVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq2hVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq2xVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq3BVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq3RVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq3hVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq3xVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq4BVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq4RVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq4hVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq4xVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq5BVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_3Heq0BVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq0hVLEeeMzp7YIeMZtw" x="2519" y="1090"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_7yg2kRVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2kxVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2lBVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7yg2lRVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2lhVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2lxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2mBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2mRVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2mhVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2mxVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2nBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2nRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2nhVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2nxVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2oBVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2oRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2ohVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2oxVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2pBVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_7yg2kBVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2khVLEeeMzp7YIeMZtw" x="2651" y="1080"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_0EXCoBVMEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCohVMEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCoxVMEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0EXCpBVMEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCpRVMEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_-U5eUBVMEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_-UmjYBVMEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-U5eURVMEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_FrX8oBVNEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_FrEaoBVNEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FrX8oRVNEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_OA0n0BVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_OAX74BVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OA0n0RVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCphVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCpxVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCqBVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCqRVMEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCqhVMEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCqxVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCrBVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCrRVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCrhVMEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCrxVMEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCsBVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCsRVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCshVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCsxVMEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_0EEHsBVMEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCoRVMEeeMzp7YIeMZtw" x="2503" y="934"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_4sOJIRVNEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJIxVNEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJJBVNEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4sOJJRVNEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJJhVNEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJJxVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJKBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJKRVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJKhVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJKxVNEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_5RXoIBVOEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_5QxLMBVOEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5RXoIRVOEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJLBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJLRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJLhVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJLxVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJMBVNEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJMRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJMhVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJMxVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJNBVNEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_4sOJIBVNEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJIhVNEeeMzp7YIeMZtw" x="2638" y="739" width="227"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_9zOfMRVNEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfMxVNEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfNBVNEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9zOfNRVNEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfNhVNEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfNxVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfOBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfORVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfOhVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfOxVNEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfPBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfPRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfPhVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfPxVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfQBVNEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfQRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfQhVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfQxVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfRBVNEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_9zOfMBVNEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfMhVNEeeMzp7YIeMZtw" x="2176" y="799" height="62"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWr8xVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9BVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9RVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr9hVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr9xVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr-BVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWr-RVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWr-hVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWr-xVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr_BVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QsWr_RVPEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QsWr8RVPEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr_hVPEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr_xVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsABVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsARVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsAhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsAxVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsBBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsBRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsBhVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsBxVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr7xVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsCxVPEeeMzp7YIeMZtw" x="1418" y="929" width="227"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWsSBVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsSRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsShVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsSxVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsTBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsTRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsThVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsTxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsUBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsURVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsUhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsUxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsVBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsVRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsVhVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsVxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsWBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsWRVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsWhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr4xVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsXhVPEeeMzp7YIeMZtw" x="1983" y="1091"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWsXxVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYBVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYRVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsYhVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsYxVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsZBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsZRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsZhVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsZxVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsaBVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsaRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsahVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsaxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsbBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsbRVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsbhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsbxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWscBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWscRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr4RVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsdRVPEeeMzp7YIeMZtw" x="1732" y="1088"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWslBVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslhVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWslxVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsmBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QsWsmRVPEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QsWr7RVPEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsmhVPEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_SCRggBVQEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_SBh5oBVQEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SCRggRVQEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_bQ1FUBVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_bQOoYBVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bQ1FURVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsnRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsnhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsnxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsoBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsoRVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_uK47kBVREeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_uKTFsBVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uK47kRVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsohVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsoxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWspBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWspRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsphVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWspxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsqBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsqRVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsqhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr7BVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsrhVPEeeMzp7YIeMZtw" x="1826" y="930"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_D3T2oBVQEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2ohVQEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2oxVQEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_D3T2pBVQEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2pRVQEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2phVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2pxVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2qBVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2qRVQEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2qhVQEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2qxVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2rBVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2rRVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2rhVQEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2rxVQEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2sBVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2sRVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2shVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2sxVQEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2oRVQEeeMzp7YIeMZtw" x="1783" y="835" height="29"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_-j608RVQEeeMzp7YIeMZtw" type="Enumeration_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_-j608xVQEeeMzp7YIeMZtw" type="Enumeration_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_-j609BVQEeeMzp7YIeMZtw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-j609RVQEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_-j609hVQEeeMzp7YIeMZtw" type="Enumeration_LiteralCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_-j609xVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_-j60-BVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-j60-RVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j60-hVQEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="model.uml#_-j608BVQEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j608hVQEeeMzp7YIeMZtw" x="2184" y="965" height="58"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_31XnYRVSEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_31XnYxVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_31XnZBVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_31XnZRVSEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnZhVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnZxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnaBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnaRVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnahVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnaxVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnbBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnbRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnbhVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnbxVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XncBVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XncRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnchVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XncxVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XndBVSEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_31XnYBVSEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnYhVSEeeMzp7YIeMZtw" x="2177" y="744" height="52"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_6giNIBVSEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIhVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIxVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6giNJBVSEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNJRVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U78U8BVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U78U8RVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNJhVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNJxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNKBVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNKRVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNKhVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VJeaoBVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VJeaoRVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_ETBa4BVTEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_ESR0ABVTEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ETBa4RVTEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNKxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNLBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNLRVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNLhVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNLxVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNMBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNMRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNMhVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNMxVSEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_6gYcIBVSEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNIRVSEeeMzp7YIeMZtw" x="2175" y="864" width="100" height="67"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_qOaNARVTEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_qOaNAxVTEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_qOjW8BVTEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qOjW8RVTEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW8hVTEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_hxRLIBVfEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hwhkQBVfEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxRLIRVfEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_xW6N0BVgEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_xVpCgBVgEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xW6N0RVgEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW8xVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW9BVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW9RVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW9hVTEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW9xVTEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW-BVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW-RVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW-hVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW-xVTEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW_BVTEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW_RVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW_hVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW_xVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjXABVTEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_qOaNABVTEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOaNAhVTEeeMzp7YIeMZtw" x="2185" y="1100"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3hKMBVhEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYUBVhEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYURVhEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_o3iYUhVhEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYUxVhEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYVBVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYVRVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYVhVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYVxVhEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYWBVhEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_xEQiIBVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_xDYYYBVhEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xEQiIRVhEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_6AI4ABVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_5_YDABVhEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6AI4ARVhEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYWRVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYWhVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYWxVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYXBVhEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYXRVhEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYXhVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYXxVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYYBVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYYRVhEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_o3bDkBVhEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hKMRVhEeeMzp7YIeMZtw" x="2159" y="652" height="87"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_T_A7MBVqEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MhVqEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MxVqEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_T_A7NBVqEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7NRVqEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7NhVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7NxVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7OBVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7ORVqEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7OhVqEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_aBtdcBVqEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_aBVC8BVqEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aBtdcRVqEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7OxVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7PBVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7PRVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7PhVqEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7PxVqEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7QBVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7QRVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7QhVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7QxVqEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_T-934BVqEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7MRVqEeeMzp7YIeMZtw" x="2306" y="1253"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_wWO9gBVsEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9ghVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9gxVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wWO9hBVsEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9hRVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9hhVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9hxVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9iBVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9iRVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9ihVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_zWxWUBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_zWDkoBVsEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zWxWURVsEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9ixVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9jBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9jRVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9jhVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9jxVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9kBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9kRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9khVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9kxVsEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_wWBiIBVsEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9gRVsEeeMzp7YIeMZtw" x="2216" y="1415"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_15nGgRVsEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_15nGgxVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_15nGhBVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_15nGhRVsEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGhhVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGhxVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGiBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGiRVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGihVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGixVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_6hM8sBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_6gpjEBVsEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6hM8sRVsEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGjBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGjRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGjhVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGjxVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGkBVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGkRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGkhVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGkxVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGlBVsEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_15nGgBVsEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGghVsEeeMzp7YIeMZtw" x="2371" y="1415"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_TQvYkBVtEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkhVtEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkxVtEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TQvYlBVtEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQvYlRVtEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_Fmv4UBVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_Fl5jwBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fmv4URVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQvYlhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQvYlxVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQvYmBVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYmRVtEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNwBVtEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_BYH7wBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_BXlJMBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BYH7wRVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNwRVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNwhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNwxVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNxBVtEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNxRVtEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNxhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNxxVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNyBVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNyRVtEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_TQsVQBVtEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYkRVtEeeMzp7YIeMZtw" x="2611" y="1310"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trQ6MRVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MhVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MxVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6NBVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6NRVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6NhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6NxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6OBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6ORVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6OhVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trQ6OxVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQ6JRVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6PBVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6PRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6PhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6PxVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6QBVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6QRVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6QhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6QxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6RBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6RRVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQ6JBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6SRVuEeeMzp7YIeMZtw" x="2956" y="1271"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhOxVuEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPBVuEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPRVuEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhPhVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhPxVuEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhQBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhQRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhQhVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhQxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhRBVuEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhRRVuEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTGBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhRhVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhRxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhSBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhSRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhShVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhSxVuEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhTBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhTRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhThVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhTxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_trQTFxVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhUxVuEeeMzp7YIeMZtw" x="3046" y="1109"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhaxVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbBVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbRVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhbhVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhbxVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhcBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhcRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhchVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhcxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhdBVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhdRVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTFhVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhdhVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhdxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRheBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRheRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhehVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhexVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhfBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhfRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhfhVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhfxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQTFRVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhgxVuEeeMzp7YIeMZtw" x="3139" y="1275"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhhBVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhRVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhhVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhhxVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhiBVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhiRVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_trQTERVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhihVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhixVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhjBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhjRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhjhVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhjxVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhkBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTExVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhkRVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhkhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhkxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhlBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhlRVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhlhVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhlxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhmBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhmRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhmhVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQTEBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhnhVuEeeMzp7YIeMZtw" x="2838" y="959"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_7uQ60BVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60RVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60hVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ60xVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ61BVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ61RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ61hVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ61xVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ62BVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ62RVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_7uQ62hVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_7uPssRVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ62xVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ63BVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ63RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ63hVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ63xVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ64BVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ64RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ64hVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ64xVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ65BVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_7uPssBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ66BVuEeeMzp7YIeMZtw" x="2841" y="1127"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_OgQLcBV1EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLchV1EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLcxV1EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OgQLdBV1EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgQLdRV1EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_SBongBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_SBA8cBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SBongRV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_VfZH0BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_Ve1uMBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VfZH0RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_agXHUBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_afrK0BV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_agXHURV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hKpOABV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hKSosBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hKpOARV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hka_8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hkFowBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hka_8RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hlW0EBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hk8kYBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hlW0ERV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_uwAQcBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_uvbosBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uwAQcRV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_1l2t8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_1lKKYBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1l2t8RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_ARw3ABV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_AQ-M0BV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ARw3ARV2EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_JGnX0BV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_JFxqUBV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGnX0RV2EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgQLdhV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgQLdxV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgQLeBV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLeRV1EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSAoBV1EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_avHfkBV2EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_auaU8BV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_avHfkRV2EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAoRV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSAohV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAoxV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSApBV1EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSApRV1EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAphV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSApxV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAqBV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSAqRV1EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_OgNIIBV1EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLcRV1EeeMzp7YIeMZtw" x="990" y="834"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxSq4xV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5BV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5RV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq5hV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq5xV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq6BV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq6RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq6hV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq6xV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq7BV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq7RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq7hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq7xV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq8BV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq8RV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq8hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq8xV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq9BV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq9RV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1sBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq-RV-EeeMzp7YIeMZtw" x="670" y="398" width="177" height="176"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxSq-hV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq-xV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq_BV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq_RV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq_hV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxSq_xV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1thV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrABV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxSrARV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1txV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrAhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrAxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrBBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrBRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrBhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrBxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrCBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrCRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrChV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrCxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrDBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrDRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrDhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrDxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrEBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1tRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrFBV-EeeMzp7YIeMZtw" x="1702" y="198"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTR8BV-EeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8RV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8hV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR8xV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR9BV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTR9RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTR9hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTR9xV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTR-BV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR-RV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTR-hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcxhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR-xV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxTR_BV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcxxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_RV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxTR_hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcyBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_xV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSABV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSARV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSAhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSAxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSBBV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSBRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSBhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSBxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSCBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_QxRcxRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSDBV-EeeMzp7YIeMZtw" x="557" y="1010" width="140" height="131"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSIRV-EeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIhV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIxV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSJBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSJRV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSJhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSJxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSKBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSKRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSKhV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSKxV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxPnkhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSLBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSLRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSLhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSLxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSMBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSMRV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSMhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSMxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSNBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSNRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_QxPnkBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSORV-EeeMzp7YIeMZtw" x="215" y="995" width="139" height="145"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSQxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSRhV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSRxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSSBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPnmRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSSRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSShV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSSxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSTBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSTRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSThV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSTxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSUBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSURV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSUhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSUxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSVBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSVRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSVhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSVxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPnmBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSWxV-EeeMzp7YIeMZtw" x="920" y="357"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSXBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSXxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSYBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSYRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOthV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSYhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSYxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSZBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSZRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSZhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSZxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSaBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSaRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSahV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSaxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSbBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSbRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSbhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSbxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTScBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSdBV-EeeMzp7YIeMZtw" x="1273" y="413" width="240" height="199"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5HhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5HxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5IBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5IRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5IhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5IxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5JRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5JxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5KBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5KRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5KhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5KxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5LBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5LRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5LhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5LxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5MBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5MhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5NBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5NhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD5BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5OBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD5RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ORV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5OhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5OxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5PBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5PRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5PhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5PxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5QBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5QRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5QhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD2xV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5RhV-EeeMzp7YIeMZtw" x="442" y="603" width="189" height="249"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5TxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5UBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5URV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5UhV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5UxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5VBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAhRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5VhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAhhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5WBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5WRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5WhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5WxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5XBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5XRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5XhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5XxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5YBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5YRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5YhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5YxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5ZBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5ZRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ZhV-EeeMzp7YIeMZtw" type="compartment_shape_display">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5ZxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aRV-EeeMzp7YIeMZtw" x="166" y="403" width="196" height="173"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5ahV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5axV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5bBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5bRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5bhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5bxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5cBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5cRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5chV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5cxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5dBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5dRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5dhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5dxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5eBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5eRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5ehV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5exV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5fBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOrxV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5gBV-EeeMzp7YIeMZtw" x="1115" y="676"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5gRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ghV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5gxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5hBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5hRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5hhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5hxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5iBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5iRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ihV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5ixV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSq4hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5jBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5jRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5jhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5jxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5kBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5kRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5khV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5kxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5lBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5lRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSq4BV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5mRV-EeeMzp7YIeMZtw" x="868" y="36" width="208" height="196"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5mhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5mxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5nBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5nRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5nhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5nxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOoRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5oBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5oRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOohV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ohV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5oxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5pBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5pRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5phV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5pxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5qBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5qRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5qhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5qxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5rBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5rRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5rhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5rxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5sBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOoBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5tBV-EeeMzp7YIeMZtw" x="1551" y="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgERV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgEhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgExV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgFBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgFRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgFhV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgFxV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgGBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAiRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgGhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAihV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgHBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAixV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgHhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgIBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgIhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAkBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgJBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgJhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgKBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgKRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgKhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgKxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgLBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgLRV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgLhV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgLxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxPAkRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgMBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgMRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgMhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgMxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgNBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgNRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgNhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgNxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgOBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgORV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAiBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgPRV-EeeMzp7YIeMZtw" x="378" y="15" width="204" height="303"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgRxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgShV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgSxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgTBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOshV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgThV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOsxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOtBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgURV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgUhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgUxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgVBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgVRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgVxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgWBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgWRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgWhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgXBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgXRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgXhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgXxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOsRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgYxV-EeeMzp7YIeMZtw" x="1344" y="200"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgZBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgZxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgaBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgaRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD1RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgahV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgaxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgbBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgbRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgbhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgbxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgcBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD1hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgchV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD1xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgdBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgdhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgeBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgeRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgehV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgexV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgfBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgfRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgfhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgfxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUggBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUggRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgghV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD0xV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUghhV-EeeMzp7YIeMZtw" x="691" y="683" width="161" height="167"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgnhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgnxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgoBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgoRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgohV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgoxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOpRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgpBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgpRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOphV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgphV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgpxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOpxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgqBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgqRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgqhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgqxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgrBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgrRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgrhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgrxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgsBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgshV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgtBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgthV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUguBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUguhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgvBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgvRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgvhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgvxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgwBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgwRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgwhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgwxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgxBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOoxV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgyBV-EeeMzp7YIeMZtw" x="176" y="660" width="168" height="257"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHMRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHNRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHNhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1tBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHOBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHORV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHOhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHOxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHPBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHPRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHPhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHPxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHQBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHQRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHQhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHQxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHRBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHRRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1shV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHSRV-EeeMzp7YIeMZtw" x="1598" y="675"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHYRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHZBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHZRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHZhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHZxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHaBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHaRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHahV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHaxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1uhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHbRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHbxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHcBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHcRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHchV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHcxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHdRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHdxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1whV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHeBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHeRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHehV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHexV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHfRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHfxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHgBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHgRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHghV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHgxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHhRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHhxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHiBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHiRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHihV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHixV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHjBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHjRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHjhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHjxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1uBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHkxV-EeeMzp7YIeMZtw" x="-69" y="660" width="177" height="412"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHlBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHlxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHmBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHmRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAgRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHmhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHmxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAghV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHnRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAgxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHnxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHoBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHoRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHohV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHoxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHpBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHpRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHphV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHpxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHqBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHqRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHqhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHqxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHrBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAgBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHsBV-EeeMzp7YIeMZtw" x="501" y="1216" width="151" height="141"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHsRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHshV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHsxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHtRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHthV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD0RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHuhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHuxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHvBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHvRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHvhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHvxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHwBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHwRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHwhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHwxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHxBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHxRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHxhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHxxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD0BV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHyxV-EeeMzp7YIeMZtw" x="689" y="1216" width="136" height="136"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVuSxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuThV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuTxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVuUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPnlxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuURV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuUhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuUxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuVBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuVRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuVxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuWBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuWRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuWhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuXBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuXRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuXhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuXxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPnlRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuYxV-EeeMzp7YIeMZtw" x="1309" y="673"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_AN9ZERVKEeeMzp7YIeMZtw" name="diagram_compatibility_version" stringValue="1.2.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_AN9ZEhVKEeeMzp7YIeMZtw"/>
-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AN9ZExVKEeeMzp7YIeMZtw">
-    <owner xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
-  </styles>
-  <element xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
-  <edges xmi:type="notation:Connector" xmi:id="_d3PDsBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_td6vkBVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_d3PDsxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfG6EBVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d3PDtBVNEeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_d3PDsRVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_d28IwBVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d3PDshVNEeeMzp7YIeMZtw" points="[1619, 526, -643984, -643984]$[1652, 462, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0BVNEeeMzp7YIeMZtw" id="(0.63,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0RVNEeeMzp7YIeMZtw" id="(0.0,0.7734375)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_g_M6MBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_3Heq0RVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_g_M6MxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfjmABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g_M6NBVNEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_g_M6MRVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_g-wOQBVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_M6MhVNEeeMzp7YIeMZtw" points="[1714, 531, -643984, -643984]$[1711, 487, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_EBVNEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_ERVNEeeMzp7YIeMZtw" id="(0.45925925925925926,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_iOWN4BVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_7yg2kRVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_iOWN4xVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qgc94BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_iOWN5BVNEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_iOWN4RVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_iN5h8BVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iOWN4hVNEeeMzp7YIeMZtw" points="[1832, 495, -643984, -643984]$[1787, 464, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50BVNEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50RVNEeeMzp7YIeMZtw" id="(1.0,0.7890625)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_AhSn8RVOEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4BVOEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qf2g8BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4RVOEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4hVOEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QgTM4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4xVOEeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_AhSn8hVOEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_AhSn8BVOEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AhSn8xVOEeeMzp7YIeMZtw" points="[1709, 375, -643984, -643984]$[1709, 347, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwBVOEeeMzp7YIeMZtw" id="(0.12574850299401197,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwRVOEeeMzp7YIeMZtw" id="(1.0,0.5967741935483871)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Gn1vcBVOEeeMzp7YIeMZtw" type="Association_Edge" source="_4sOJIRVNEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vcxVOEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3yl9ABVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdBVOEeeMzp7YIeMZtw" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdRVOEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zCo8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdhVOEeeMzp7YIeMZtw" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdxVOEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zMZ8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1veBVOEeeMzp7YIeMZtw" x="-5" y="21"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1veRVOEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zVj4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vehVOEeeMzp7YIeMZtw" x="-56" y="11"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vexVOEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zfU4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfBVOEeeMzp7YIeMZtw" x="43" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vfRVOEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zpF4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfhVOEeeMzp7YIeMZtw" x="-43" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Gn1vcRVOEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_GXLdQBVOEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gn1vchVOEeeMzp7YIeMZtw" points="[1384, 534, -643984, -643984]$[1652, 413, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQBVOEeeMzp7YIeMZtw" id="(0.22026431718061673,0.98)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQRVOEeeMzp7YIeMZtw" id="(0.844311377245509,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QsWsKhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsSBVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsKxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S0VFABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsLBVPEeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QsWsLRVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QsWr5BVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsLhVPEeeMzp7YIeMZtw" points="[1027, 517, -643984, -643984]$[1024, 473, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsLxVPEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsMBVPEeeMzp7YIeMZtw" id="(0.9880952380952381,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QsWsdhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsXxVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsdxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S1Oc4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWseBVPEeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QsWseRVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QsWr4hVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsehVPEeeMzp7YIeMZtw" points="[932, 512, -643984, -643984]$[965, 448, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsexVPEeeMzp7YIeMZtw" id="(0.62,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsfBVPEeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_jbedcRVPEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddBVPEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_kH0BVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddRVPEeeMzp7YIeMZtw" x="-1" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddhVPEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_3CwBVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddxVPEeeMzp7YIeMZtw" x="-1" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_jbedchVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_jbedcBVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jbedcxVPEeeMzp7YIeMZtw" points="[1019, 371, -643984, -643984]$[1324, 295, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QBVPEeeMzp7YIeMZtw" id="(0.5515151515151515,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QRVPEeeMzp7YIeMZtw" id="(0.0,0.5967741935483871)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_YErngBVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_YErngxVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZHmEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhBVTEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_YErnhRVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZ4bEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhhVTEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_YErngRVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_YEh2gBVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YErnghVTEeeMzp7YIeMZtw" points="[1143, 420, -643984, -643984]$[1324, 320, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJUBVTEeeMzp7YIeMZtw" id="(1.0,0.07407407407407407)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJURVTEeeMzp7YIeMZtw" id="(0.0,0.22388059701492538)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_a_WB0BVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB0xVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbbTMBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1BVTEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB1RVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbsY8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1hVTEeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_a_WB0RVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_a_MQ0BVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a_WB0hVTEeeMzp7YIeMZtw" points="[1652, 405, -643984, -643984]$[1424, 326, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosBVTEeeMzp7YIeMZtw" id="(0.0,0.15625)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosRVTEeeMzp7YIeMZtw" id="(1.0,0.31343283582089554)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_tsxKQRVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_qOaNARVTEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRBVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RaeQ8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRRVTEeeMzp7YIeMZtw" x="1" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRhVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ra8yEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRxVTEeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_tsxKQhVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_tsxKQBVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tsxKQxVTEeeMzp7YIeMZtw" points="[1379, 541, -643984, -643984]$[1143, 468, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIBVTEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIRVTEeeMzp7YIeMZtw" id="(1.0,0.7185185185185186)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_aeMUMBVhEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWr8xVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUMxVhEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QNbI0BV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNBVhEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUNRVhEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QN6RABV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNhVhEeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_aeMUMRVhEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_aeJQ4BVhEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aeMUMhVhEeeMzp7YIeMZtw" points="[843, 524, -643984, -643984]$[1024, 524, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoBVhEeeMzp7YIeMZtw" id="(0.9955947136563876,0.51)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoRVhEeeMzp7YIeMZtw" id="(0.0,0.37037037037037035)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_8dGJABVpEeeMzp7YIeMZtw" type="Association_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJAxVpEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QK6AUBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBBVpEeeMzp7YIeMZtw" x="-2" y="-17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBRVpEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QLVeIBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBhVpEeeMzp7YIeMZtw" x="1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBxVpEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QL3poBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJCBVpEeeMzp7YIeMZtw" x="216" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCRVpEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMQrMBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJChVpEeeMzp7YIeMZtw" x="-216" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCxVpEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMmpcBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDBVpEeeMzp7YIeMZtw" x="214" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJDRVpEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QM8AoBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDhVpEeeMzp7YIeMZtw" x="-215" y="-17"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_8dGJARVpEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_8clysBVpEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8dGJAhVpEeeMzp7YIeMZtw" points="[1083, 449, -643984, -643984]$[1357, 213, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QBVpEeeMzp7YIeMZtw" id="(0.3575757575757576,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QRVpEeeMzp7YIeMZtw" id="(0.0,0.4827586206896552)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_IM27wBVqEeeMzp7YIeMZtw" type="Association_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8BVqEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeN18BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8RVqEeeMzp7YIeMZtw" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8hVqEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeuMQBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8xVqEeeMzp7YIeMZtw" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9BVqEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Je-q8BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9RVqEeeMzp7YIeMZtw" x="56" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9hVqEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfN7gBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9xVqEeeMzp7YIeMZtw" x="-56" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-BVqEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfdMEBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-RVqEeeMzp7YIeMZtw" x="56" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-hVqEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Jf1mkBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-xVqEeeMzp7YIeMZtw" x="-56" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_IM27wRVqEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_IMUJMBVqEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IM27whVqEeeMzp7YIeMZtw" points="[1735, 454, -643984, -643984]$[1512, 209, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgBVqEeeMzp7YIeMZtw" id="(0.3652694610778443,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgRVqEeeMzp7YIeMZtw" id="(1.0,0.42528735632183906)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_CBI5ABVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_15nGgRVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppUHoBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMRVtEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppqF4BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMxVtEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_CBI5ARVtEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_CBHq4BVtEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CBI5AhVtEeeMzp7YIeMZtw" points="[1924, 843, -643984, -643984]$[1890, 792, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xUBVtEeeMzp7YIeMZtw" id="(0.30985915492957744,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xURVtEeeMzp7YIeMZtw" id="(0.5434782608695652,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_PdCdcBVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_wWO9gBVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pp7ysBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkRVtEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pqPUsBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkxVtEeeMzp7YIeMZtw" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_PdCdcRVtEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_Pc_aIBVtEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PdCdchVtEeeMzp7YIeMZtw" points="[1789, 843, -643984, -643984]$[1815, 792, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8BVtEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8RVtEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_RM6qMBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_TQvYkBVtEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQBVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mTnXIBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQRVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQhVuEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUBm0BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQxVuEeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRBVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUTToBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUjLQBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRxVuEeeMzp7YIeMZtw" x="-5" y="12"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RSBVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mU04EBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSRVuEeeMzp7YIeMZtw" x="20" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RShVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mVMEcBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSxVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_RM6qMRVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_RMhooBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RM6qMhVuEeeMzp7YIeMZtw" points="[2076, 810, -643984, -643984]$[1953, 739, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkBVuEeeMzp7YIeMZtw" id="(0.0,0.7087378640776699)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkRVuEeeMzp7YIeMZtw" id="(1.0,0.5225225225225225)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trQ6JhVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trRhaxVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6JxVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6KRVuEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6KhVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6LBVuEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trQ6LRVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_trPsABVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trQ6LhVuEeeMzp7YIeMZtw" points="[2289, 766, -643984, -643984]$[2255, 715, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6LxVuEeeMzp7YIeMZtw" id="(0.305,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6MBVuEeeMzp7YIeMZtw" id="(0.5408163265306123,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trRhMBVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trQ6MRVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhMRVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhMhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhMxVuEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhNBVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhNRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhNhVuEeeMzp7YIeMZtw" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trRhNxVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_trQTFBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhOBVuEeeMzp7YIeMZtw" points="[2154, 766, -643984, -643984]$[2180, 715, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhORVuEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhOhVuEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trRhVBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_trRhhBVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhVRVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhVhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhVxVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWBVuEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhWRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhWhVuEeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWxVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhXRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhXhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYBVuEeeMzp7YIeMZtw" x="-5" y="12"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhYRVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhYhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYxVuEeeMzp7YIeMZtw" x="20" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhZBVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhZRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhZhVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trRhZxVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_trQ6IBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhaBVuEeeMzp7YIeMZtw" points="[2174, 573, -643984, -643984]$[2051, 502, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhaRVuEeeMzp7YIeMZtw" id="(0.8888888888888888,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhahVuEeeMzp7YIeMZtw" id="(0.389937106918239,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_BMxx8RVvEeeMzp7YIeMZtw" type="Dependency_Edge" source="_7uQ60BVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9BVvEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HxRkQBVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9RVvEeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9hVvEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Hx-u4BVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9xVvEeeMzp7YIeMZtw" x="1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_BMxx8hVvEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_BMxx8BVvEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BMxx8xVvEeeMzp7YIeMZtw" points="[1968, 789, -643984, -643984]$[2245, 718, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4BVvEeeMzp7YIeMZtw" id="(0.993421052631579,0.61)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4RVvEeeMzp7YIeMZtw" id="(0.0,0.5855855855855856)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSDRV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHlBV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSDhV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSDxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSEBV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSERV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSEhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSExV-EeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSFBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxRcwBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSFRV-EeeMzp7YIeMZtw" points="[519, 1169, -643984, -643984]$[519, 1092, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFhV-EeeMzp7YIeMZtw" id="(0.44370860927152317,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFxV-EeeMzp7YIeMZtw" id="(0.19285714285714287,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSGBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxTSIRV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSGhV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSHBV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSHRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPAhxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSHhV-EeeMzp7YIeMZtw" points="[291, 907, -643984, -643984]$[290, 985, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSHxV-EeeMzp7YIeMZtw" id="(0.7440476190476191,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSIBV-EeeMzp7YIeMZtw" id="(0.6115107913669064,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSOhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxT5TxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSOxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSPRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPhV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSPxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPnkxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSQBV-EeeMzp7YIeMZtw" points="[253, 393, -643984, -643984]$[368, 308, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQRV-EeeMzp7YIeMZtw" id="(0.49489795918367346,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQhV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSdRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5HhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSdhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSdxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSeBV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSeRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxSD3BV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSehV-EeeMzp7YIeMZtw" points="[427, 677, -643984, -643984]$[352, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSexV-EeeMzp7YIeMZtw" id="(0.1111111111111111,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSfBV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSfRV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSfhV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSfxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgBV-EeeMzp7YIeMZtw" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSgRV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSghV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgxV-EeeMzp7YIeMZtw" x="-1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShBV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTShRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTShhV-EeeMzp7YIeMZtw" x="51" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShxV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSiBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSiRV-EeeMzp7YIeMZtw" x="-52" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSihV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSixV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjBV-EeeMzp7YIeMZtw" x="51" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSjRV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSjhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjxV-EeeMzp7YIeMZtw" x="-52" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSkBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxOZdBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSkRV-EeeMzp7YIeMZtw" points="[903, 338, -643984, -643984]$[572, 230, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkhV-EeeMzp7YIeMZtw" id="(0.0,0.35)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkxV-EeeMzp7YIeMZtw" id="(1.0,0.7425742574257426)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSlBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5ahV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSlRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSlhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSlxV-EeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSmBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQOsBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSmRV-EeeMzp7YIeMZtw" points="[1424, 636, -643984, -643984]$[1515, 572, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmhV-EeeMzp7YIeMZtw" id="(0.5982142857142857,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmxV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSnBV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxT5gRV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSnRV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSnhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSnxV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSoRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSohV-EeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSpRV-EeeMzp7YIeMZtw" x="44" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSphV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqBV-EeeMzp7YIeMZtw" x="-43" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSqRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSqhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqxV-EeeMzp7YIeMZtw" x="44" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSrBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSrRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSrhV-EeeMzp7YIeMZtw" x="-43" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSrxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxSD5hV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSsBV-EeeMzp7YIeMZtw" points="[862, 51, -643984, -643984]$[572, 58, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSsRV-EeeMzp7YIeMZtw" id="(0.0,0.1683673469387755)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSshV-EeeMzp7YIeMZtw" id="(1.0,0.17491749174917492)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5ABV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxT5gRV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ARV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5AhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5AxV-EeeMzp7YIeMZtw" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5BRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5BhV-EeeMzp7YIeMZtw" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5CRV-EeeMzp7YIeMZtw" x="15" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ChV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DBV-EeeMzp7YIeMZtw" x="-15" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5DRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5DhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DxV-EeeMzp7YIeMZtw" x="15" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5EBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5ERV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5EhV-EeeMzp7YIeMZtw" x="-15" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5ExV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxOZeBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5FBV-EeeMzp7YIeMZtw" points="[935, 317, -643984, -643984]$[928, 214, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FRV-EeeMzp7YIeMZtw" id="(0.23958333333333334,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FhV-EeeMzp7YIeMZtw" id="(0.3173076923076923,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5FxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5GBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5GRV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5GhV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQOpBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5GxV-EeeMzp7YIeMZtw" points="[213, 650, -643984, -643984]$[217, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HBV-EeeMzp7YIeMZtw" id="(0.27976190476190477,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HRV-EeeMzp7YIeMZtw" id="(0.3112244897959184,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5RxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHYRV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5SBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5SRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ShV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5SxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1uRV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5TBV-EeeMzp7YIeMZtw" points="[104, 683, -643984, -643984]$[156, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5TRV-EeeMzp7YIeMZtw" id="(0.6101694915254238,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5ThV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5tRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgZBV-EeeMzp7YIeMZtw" target="_QxSq4xV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5thV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5txV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5uBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxSD1BV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5uRV-EeeMzp7YIeMZtw" points="[717, 673, -643984, -643984]$[717, 564, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5uhV-EeeMzp7YIeMZtw" id="(0.2236024844720497,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgEBV-EeeMzp7YIeMZtw" id="(0.3220338983050847,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxUgPhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxSq4xV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgPxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgQRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQhV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxUgQxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPnlBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxUgRBV-EeeMzp7YIeMZtw" points="[660, 412, -643984, -643984]$[572, 308, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRRV-EeeMzp7YIeMZtw" id="(0.0,0.13636363636363635)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRhV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHIBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHsRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L2DOABWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHIhV-EeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L3NEkBWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHJBV-EeeMzp7YIeMZtw" x="-1" y="57"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHJRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxOZcxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHJhV-EeeMzp7YIeMZtw" points="[716, 1196, -643984, -643984]$[632, 1108, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHJxV-EeeMzp7YIeMZtw" id="(0.3553921568627451,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHKBV-EeeMzp7YIeMZtw" id="(0.65,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHKRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVuSxV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHKhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHKxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHLBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHLRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxPnlhV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHLhV-EeeMzp7YIeMZtw" points="[1589, 633, -643984, -643984]$[1589, 572, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHLxV-EeeMzp7YIeMZtw" id="(0.19895287958115182,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHMBV-EeeMzp7YIeMZtw" id="(0.30833333333333335,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHShV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSIRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHSxV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHTRV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHThV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUBV-EeeMzp7YIeMZtw" x="1" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHURV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHUhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUxV-EeeMzp7YIeMZtw" x="33" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVBV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHVRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHVhV-EeeMzp7YIeMZtw" x="-97" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVxV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHWRV-EeeMzp7YIeMZtw" x="35" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHWhV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHXBV-EeeMzp7YIeMZtw" x="-13" y="3"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHXRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxRcwRV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHXhV-EeeMzp7YIeMZtw" points="[334, 1039, -643984, -643984]$[539, 1024, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHXxV-EeeMzp7YIeMZtw" id="(1.0,0.4298850574712644)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHYBV-EeeMzp7YIeMZtw" id="(0.0,0.3511450381679389)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHzBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHMRV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHzRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHzhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHzxV-EeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVH0BV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1sxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVH0RV-EeeMzp7YIeMZtw" points="[1686, 645, -643984, -643984]$[1601, 581, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0hV-EeeMzp7YIeMZtw" id="(0.1242603550295858,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0xV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-</notation:Diagram>
diff --git a/src/Commands/model.uml b/src/Commands/model.uml
deleted file mode 100644
index 2dd5385..0000000
--- a/src/Commands/model.uml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_oX-IkBPOEeeugOD0sSUlEg" name="RootElement">
-  <packagedElement xmi:type="uml:Class" xmi:id="_tdw-kBVLEeeMzp7YIeMZtw" name="Starters">
-    <generalization xmi:type="uml:Generalization" xmi:id="_d28IwBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_3Heq0BVLEeeMzp7YIeMZtw" name="MainDishes">
-    <generalization xmi:type="uml:Generalization" xmi:id="_g-wOQBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_7yg2kBVLEeeMzp7YIeMZtw" name="Desserts">
-    <generalization xmi:type="uml:Generalization" xmi:id="_iN5h8BVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_0EEHsBVMEeeMzp7YIeMZtw" name="Dishe">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_-UmjYBVMEeeMzp7YIeMZtw" name="Name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_FrEaoBVNEeeMzp7YIeMZtw" name="Price" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_OAX74BVREeeMzp7YIeMZtw" name="disheType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_IMVXUhVqEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_4sOJIBVNEeeMzp7YIeMZtw" name="FactoryDishe">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_GnP5kBVOEeeMzp7YIeMZtw" name="dishes" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_5QxLMBVOEeeMzp7YIeMZtw" name="createDishes">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Cxjk8BVPEeeMzp7YIeMZtw" name="dishName">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedParameter>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_9zOfMBVNEeeMzp7YIeMZtw" name="Item"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_AhSn8BVOEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Association" xmi:id="_GXLdQBVOEeeMzp7YIeMZtw" memberEnd="_GnP5kBVOEeeMzp7YIeMZtw _GnZDgBVOEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GXLdQRVOEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GXLdQhVOEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_GnZDgBVOEeeMzp7YIeMZtw" name="factorydishes" type="_4sOJIBVNEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4RVPEeeMzp7YIeMZtw" name="FullMeal">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr4hVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4xVPEeeMzp7YIeMZtw" name="HalfMeal">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr5BVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7BVPEeeMzp7YIeMZtw" name="Meal">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QsWr7RVPEeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBh5oBVQEeeMzp7YIeMZtw" name="meal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bQOoYBVREeeMzp7YIeMZtw" name="mealType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8co2AhVpEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_uKTFsBVREeeMzp7YIeMZtw" name="accept"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7xVPEeeMzp7YIeMZtw" name="MealFactory">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QsWr8RVPEeeMzp7YIeMZtw" name="createMeal">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QsWr8hVPEeeMzp7YIeMZtw" name="dishName">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedParameter>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_jbedcBVPEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_D3KFoBVQEeeMzp7YIeMZtw" name="ArrayList"/>
-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_-j608BVQEeeMzp7YIeMZtw" name="ItemType">
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CVrPUBVREeeMzp7YIeMZtw" name="Standard"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_FD5JEBVREeeMzp7YIeMZtw" name="Vegetarian"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GTVXsBVREeeMzp7YIeMZtw" name="GlutenFree"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_31XnYBVSEeeMzp7YIeMZtw" name="Visitor"/>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_6gYcIBVSEeeMzp7YIeMZtw" name="Visitable">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_ESR0ABVTEeeMzp7YIeMZtw" name="accept">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Qc4vsBVTEeeMzp7YIeMZtw" name="visitor" type="_31XnYBVSEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_YEh2gBVTEeeMzp7YIeMZtw" client="_QsWr7BVPEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_a_MQ0BVTEeeMzp7YIeMZtw" client="_0EEHsBVMEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_qOaNABVTEeeMzp7YIeMZtw" name="Order">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hwhkQBVfEeeMzp7YIeMZtw" name="listMeal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_xVpCgBVgEeeMzp7YIeMZtw" name="listDishes" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_tsxKQBVTEeeMzp7YIeMZtw" client="_qOaNABVTEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_aeJQ4BVhEeeMzp7YIeMZtw" client="_QsWr7xVPEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_o3bDkBVhEeeMzp7YIeMZtw" name="OrderVisitor">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_xDYYYBVhEeeMzp7YIeMZtw" name="visit">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_4635EBVhEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_5_YDABVhEeeMzp7YIeMZtw" name="visit">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_-mbGoBVhEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_8clysBVpEeeMzp7YIeMZtw" memberEnd="_8co2AhVpEeeMzp7YIeMZtw _8co2AxVpEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8co2ABVpEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8co2ARVpEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_8co2AxVpEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_IMUJMBVqEeeMzp7YIeMZtw" memberEnd="_IMVXUhVqEeeMzp7YIeMZtw _IMVXUxVqEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IMVXUBVqEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IMVXURVqEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_IMVXUxVqEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_T-934BVqEeeMzp7YIeMZtw" name="StrategyDeliveryPolicy">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_aBVC8BVqEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_wWBiIBVsEeeMzp7YIeMZtw" name="FastestDelivery">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_zWDkoBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_15nGgBVsEeeMzp7YIeMZtw" name="FairOccupationDelivery">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_6gpjEBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_CBHq4BVtEeeMzp7YIeMZtw" client="_15nGgBVsEeeMzp7YIeMZtw" supplier="_T-934BVqEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_Pc_aIBVtEeeMzp7YIeMZtw" client="_wWBiIBVsEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_TQsVQBVtEeeMzp7YIeMZtw" name="ContextDeliveryPolicy">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Fl5jwBVuEeeMzp7YIeMZtw" name="strategyDeliveryPolicy" visibility="private" type="_T-934BVqEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_RMiPshVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_T-934BVqEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_BXlJMBVuEeeMzp7YIeMZtw" name="execute"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_RMhooBVuEeeMzp7YIeMZtw" memberEnd="_RMiPshVuEeeMzp7YIeMZtw _RMiPsxVuEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RMiPsBVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RMiPsRVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_RMiPsxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_TQsVQBVtEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_trPsABVuEeeMzp7YIeMZtw" client="_trQTFRVuEeeMzp7YIeMZtw" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQTEBVuEeeMzp7YIeMZtw" name="ContextTargetProfit">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTERVuEeeMzp7YIeMZtw" name="strategyTargetProfit" visibility="private" type="_trQTFxVuEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTEhVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_trQTFxVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTExVuEeeMzp7YIeMZtw" name="execute"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_trQTFBVuEeeMzp7YIeMZtw" client="_trQ6JBVuEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQTFRVuEeeMzp7YIeMZtw" name="TargetProfitMarkup">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTFhVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_trQTFxVuEeeMzp7YIeMZtw" name="StrategyTargetProfitPolicy">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTGBVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_trQ6IBVuEeeMzp7YIeMZtw" memberEnd="_trQTEhVuEeeMzp7YIeMZtw _trQ6IxVuEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_trQ6IRVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_trQ6IhVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_trQ6IxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_trQTEBVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQ6JBVuEeeMzp7YIeMZtw" name="TargetProfitServiceFee">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQ6JRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_7uPssBVuEeeMzp7YIeMZtw" name="TargetProfitDeliveryCost">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_7uPssRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_BMxx8BVvEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_OgNIIBV1EeeMzp7YIeMZtw" name="MyFoodora">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBA8cBV1EeeMzp7YIeMZtw" name="serviceFee" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Ve1uMBV1EeeMzp7YIeMZtw" name="markupPercentage" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_afrK0BV1EeeMzp7YIeMZtw" name="deliveryCost" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hKSosBV1EeeMzp7YIeMZtw" name="listRestaurant" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hkFowBV1EeeMzp7YIeMZtw" name="listCustomer" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hk8kYBV1EeeMzp7YIeMZtw" name="listCourier" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_uvbosBV1EeeMzp7YIeMZtw" name="listManager" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_1lKKYBV1EeeMzp7YIeMZtw" name="targetProfitPolicy" visibility="private" type="_trQTEBVuEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_AQ-M0BV2EeeMzp7YIeMZtw" name="deliveryPolicy" visibility="private" type="_TQsVQBVtEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_JFxqUBV2EeeMzp7YIeMZtw" name="specialOffer" visibility="private"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_auaU8BV2EeeMzp7YIeMZtw" name="Operation1"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxOZcxV-EeeMzp7YIeMZtw" client="_QxSD0BV-EeeMzp7YIeMZtw" supplier="_QxRcxRV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZdBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmxV-EeeMzp7YIeMZtw _QxOZdxV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZdRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZdhV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZdxV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZeBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmhV-EeeMzp7YIeMZtw _QxOZexV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZeRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZehV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZexV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAgBV-EeeMzp7YIeMZtw" name="MealOfTheWeek">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgRV-EeeMzp7YIeMZtw" name="state" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAghV-EeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgxV-EeeMzp7YIeMZtw" name="Meal" visibility="private"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAhBV-EeeMzp7YIeMZtw" name="HumanUser" isAbstract="true">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhRV-EeeMzp7YIeMZtw" name="birthDate">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhhV-EeeMzp7YIeMZtw" name="surname">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPAhxV-EeeMzp7YIeMZtw" client="_QxQOoxV-EeeMzp7YIeMZtw" supplier="_QxPnkBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAiBV-EeeMzp7YIeMZtw" name="User" visibility="public" isAbstract="true">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAiRV-EeeMzp7YIeMZtw" name="id" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAihV-EeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAixV-EeeMzp7YIeMZtw" name="username" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjBV-EeeMzp7YIeMZtw" name="password" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjRV-EeeMzp7YIeMZtw" name="adress" visibility="private" type="_QxQOoBV-EeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjhV-EeeMzp7YIeMZtw" name="mail" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjxV-EeeMzp7YIeMZtw" name="phoneNumber" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAkBV-EeeMzp7YIeMZtw" name="activated" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPAkRV-EeeMzp7YIeMZtw" name="register"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_QxPnkBV-EeeMzp7YIeMZtw" name="Observer">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnkRV-EeeMzp7YIeMZtw" name="oservableoffer" type="_QxRcxRV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPnkhV-EeeMzp7YIeMZtw" name="update"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnkxV-EeeMzp7YIeMZtw" client="_QxPAhBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnlBV-EeeMzp7YIeMZtw" client="_QxQ1sBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnlRV-EeeMzp7YIeMZtw" name="PointFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxPnlhV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnlxV-EeeMzp7YIeMZtw" name="numberOfPoints">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnmBV-EeeMzp7YIeMZtw" name="MyFoodoraSystem">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmRV-EeeMzp7YIeMZtw" name="prodFactory" visibility="private" type="_QxSq4BV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmhV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoBV-EeeMzp7YIeMZtw" name="Adress">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOoRV-EeeMzp7YIeMZtw" name="x" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOohV-EeeMzp7YIeMZtw" name="y" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoxV-EeeMzp7YIeMZtw" name="Customer">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOpBV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpRV-EeeMzp7YIeMZtw" name="spamAgree" aggregation="composite">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOphV-EeeMzp7YIeMZtw" name="historique"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpxV-EeeMzp7YIeMZtw" name="card" type="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqBV-EeeMzp7YIeMZtw" name="placeOrder"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqRV-EeeMzp7YIeMZtw" name="registerFidelityPlan"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqhV-EeeMzp7YIeMZtw" name="unregisterFidelityPlan"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqxV-EeeMzp7YIeMZtw" name="getHistoryOfOrders"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrBV-EeeMzp7YIeMZtw" name="getPointsInTheCard"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrRV-EeeMzp7YIeMZtw" name="acceptSpam"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrhV-EeeMzp7YIeMZtw" name="refuseSpam"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOrxV-EeeMzp7YIeMZtw" name="BasicFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOsBV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOsRV-EeeMzp7YIeMZtw" name="Date">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOshV-EeeMzp7YIeMZtw" name="year" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOsxV-EeeMzp7YIeMZtw" name="month" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOtBV-EeeMzp7YIeMZtw" name="day" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOtRV-EeeMzp7YIeMZtw" name="FidelityCard">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOthV-EeeMzp7YIeMZtw" name="ID">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1sBV-EeeMzp7YIeMZtw" name="MoralUser" isAbstract="true"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1shV-EeeMzp7YIeMZtw" name="LotteryFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1sxV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1tBV-EeeMzp7YIeMZtw" name="percentage" isReadOnly="true">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1tRV-EeeMzp7YIeMZtw" name="Position">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1thV-EeeMzp7YIeMZtw" name="x" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1txV-EeeMzp7YIeMZtw" name="y" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1uBV-EeeMzp7YIeMZtw" name="Manager">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1uRV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1uhV-EeeMzp7YIeMZtw" name="addUser">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1uxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vBV-EeeMzp7YIeMZtw" name="removeUser">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1vRV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vhV-EeeMzp7YIeMZtw" name="changeServiceFee"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vxV-EeeMzp7YIeMZtw" name="changeMarkupPercentage"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wBV-EeeMzp7YIeMZtw" name="changeDeliveryCost"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wRV-EeeMzp7YIeMZtw" name="getTotalIncome"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1whV-EeeMzp7YIeMZtw" name="getProfit"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wxV-EeeMzp7YIeMZtw" name="getAverageIncome"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xBV-EeeMzp7YIeMZtw" name="getAverageProfit"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xRV-EeeMzp7YIeMZtw" name="getAverageIncomePerCustomer"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xhV-EeeMzp7YIeMZtw" name="setTargetProfitPolicy"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xxV-EeeMzp7YIeMZtw" name="getMostsellingRestaurant"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yBV-EeeMzp7YIeMZtw" name="getLeastSellingRestaurant"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yRV-EeeMzp7YIeMZtw" name="setDeliveryPolicy"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxRcwBV-EeeMzp7YIeMZtw" client="_QxPAgBV-EeeMzp7YIeMZtw">
-    <supplier xmi:type="uml:Model" href="file:/B:/Mes%20Documents/progra/java/software/td/my.foodora/FoodoraUml/model.uml#__GX94BP0EeeyD81rpgqPUg"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxRcwRV-EeeMzp7YIeMZtw" memberEnd="_QxPnkRV-EeeMzp7YIeMZtw _QxRcxBV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxRcwhV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxRcwxV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxRcxBV-EeeMzp7YIeMZtw" name="observer" type="_QxPnkBV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_QxRcxRV-EeeMzp7YIeMZtw" name="OservableOffer">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxhV-EeeMzp7YIeMZtw" name="attachObserver"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxxV-EeeMzp7YIeMZtw" name="detachObserver"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcyBV-EeeMzp7YIeMZtw" name="notify"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0BV-EeeMzp7YIeMZtw" name="BirthdayOffer">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD0RV-EeeMzp7YIeMZtw" name="state" visibility="private"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0xV-EeeMzp7YIeMZtw" name="Restaurant">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD1BV-EeeMzp7YIeMZtw" general="_QxQ1sBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD1RV-EeeMzp7YIeMZtw" name="listOfMeal"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1hV-EeeMzp7YIeMZtw" name="addItem"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1xV-EeeMzp7YIeMZtw" name="removeItem"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2BV-EeeMzp7YIeMZtw" name="setGenericDiscountFactor"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2RV-EeeMzp7YIeMZtw" name="setSpecialDiscountFactor"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2hV-EeeMzp7YIeMZtw" name="sortOrders"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD2xV-EeeMzp7YIeMZtw" name="Courier">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD3BV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3RV-EeeMzp7YIeMZtw" name="position" type="_QxQ1tRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3hV-EeeMzp7YIeMZtw" name="numberOfLivraison">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3xV-EeeMzp7YIeMZtw" name="available">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4BV-EeeMzp7YIeMZtw" name="register"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4RV-EeeMzp7YIeMZtw" name="unregister"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4hV-EeeMzp7YIeMZtw" name="setAvailability"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4xV-EeeMzp7YIeMZtw" name="changePosition"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5BV-EeeMzp7YIeMZtw" name="acceptDelivery"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5RV-EeeMzp7YIeMZtw" name="refuseDelivery"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxSD5hV-EeeMzp7YIeMZtw" memberEnd="_QxSq4RV-EeeMzp7YIeMZtw _QxSD6RV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxSD5xV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxSD6BV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxSD6RV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSq4BV-EeeMzp7YIeMZtw" name="UserFactory">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSq4RV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSq4hV-EeeMzp7YIeMZtw" name="createUser"/>
-  </packagedElement>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_tczxwBVKEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tczxwRVKEeeMzp7YIeMZtw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-  </profileApplication>
-</uml:Model>
diff --git a/src/Core/ActiveUserContext.java b/src/Core/ActiveUserContext.java
index 2fab415..c412226 100644
--- a/src/Core/ActiveUserContext.java
+++ b/src/Core/ActiveUserContext.java
@@ -1,18 +1,27 @@
-package Core;
-
-import User.User;
-
-public class ActiveUserContext {
-	
-	User activeUser;
-	public ActiveUserContext(MyFoodora foodora) {
-		// TODO Auto-generated constructor stub
-		activeUser = null;
-	}
-	public User getUser(){
-		return activeUser;
-	}
-	public void setActiveUser(User u){
-		activeUser = u;
-	}
-}
+package Core;
+
+import User.User;
+
+/**
+ * A session Class, it allow the user to be plugged to the Clui and not IN the Clui.
+ * When a login is done, the activeUser value is the user logged, which allow commands to
+ * affect himself. It also allow to check if the user is granted to execute the task.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class ActiveUserContext {
+	
+	User activeUser;
+	public ActiveUserContext(MyFoodora foodora) {
+		// TODO Auto-generated constructor stub
+		activeUser = null;
+	}
+	public User getUser(){
+		return activeUser;
+	}
+	public void setActiveUser(User u){
+		activeUser = u;
+	}
+}
diff --git a/src/Core/ContextStrategy.java b/src/Core/ContextStrategy.java
index 921f9fe..a5f7f1a 100644
--- a/src/Core/ContextStrategy.java
+++ b/src/Core/ContextStrategy.java
@@ -1,8 +1,8 @@
-package Core;
-
-import Exception.ExceptionUnknownStartegyType;
-
-public interface ContextStrategy {	
-	public abstract void setStrategy(String strategyName) throws ExceptionUnknownStartegyType;
-
-}
+package Core;
+
+import Exception.ExceptionUnknownStartegyType;
+
+public interface ContextStrategy {	
+	public abstract void setStrategy(String strategyName) throws ExceptionUnknownStartegyType;
+
+}
diff --git a/src/Core/Main.java b/src/Core/Main.java
index 27f526a..dc2ac44 100644
--- a/src/Core/Main.java
+++ b/src/Core/Main.java
@@ -1,66 +1,60 @@
-package Core;
-
-import java.util.ArrayList;
-
-import Cli.Clui;
-import Cli.errorWrongFormatValue;
-import Cli.errorWrongNumberOfParams;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Others.Adress;
-import User.User;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-
-public class Main {
-
-	public Main() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public static void main(String[] args)  {
-		// TODO Auto-generated method stub
-		MyFoodora foodora = null;
-		foodora = new MyFoodora();
-		ActiveUserContext activeUser = new ActiveUserContext(foodora);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setServiceFee(3.0);
-		Clui clui = new Clui(foodora,activeUser);
-		
-		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		foodora.addManager(manager);
-		
-		clui.executeCommand("runtest scenario/my_foodora.ini");
-		clui.executeCommand("runtest scenario/testScenario1.txt");
-		
-		/*
-		foodora.addManager(manager);
-		foodora.addUser(manager);
-		
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"", "", foodora,User.RESTAURANT,"Moral");
-		manager.addUser(045, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
-		
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		Customer custo1 = (Customer) foodora.getUserByName("henry", "henry");
-		resto1.addDish("MainDish", "pat�", "glutenFree", 4.5);
-		resto1.createMeal("MyMeal", "HalfMeal");
-		resto1.getMealByName("MyMeal").addDish(resto1.getDishByName("pat�"));
-		
-		custo1.createOrder("myOrder",resto1);
-		custo1.getOrderByName("myOrder").add(resto1.getDishByName("pat�"));
-		custo1.getOrderByName("myOrder").add(resto1.getMealByName("MyMeal"));
-		
-		clui.executeCommand("login jacquo 123456789");
-		clui.executeCommand("registerRestaurant 0123456789 resto resto mail password 0.01,0.02");
-		clui.executeCommand("registerCustomer 0123456789 custo custo mail password 0.01,0.02 22/03/1995");
-		clui.executeCommand("registerCourier 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995");
-		*/
-		clui.launchClui();
-	}
-
-}
+package Core;
+
+import Cli.Clui;
+import Others.Adress;
+import User.Manager;
+
+/**
+ * Initialize the Foodora System, the Clui and the activeUserContext.
+ * We may have as many Main instance as we want to.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class Main {
+	
+	private static MyFoodora foodora = new MyFoodora();
+	
+	public Main() {
+	}
+
+	public static void main(String[] args)  {
+		// TODO Auto-generated method stub
+		ActiveUserContext activeUser = new ActiveUserContext(foodora);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setServiceFee(3.0);
+		Clui clui = new Clui(foodora,activeUser);
+		
+		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		foodora.addManager(manager);
+		
+		clui.executeCommand("runtest scenario/my_foodora.ini");
+		clui.executeCommand("runtest scenario/testScenario1.txt");
+		
+		/*
+		foodora.addManager(manager);
+		foodora.addUser(manager);
+		
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"", "", foodora,User.RESTAURANT,"Moral");
+		manager.addUser(045, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
+		
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		Customer custo1 = (Customer) foodora.getUserByName("henry", "henry");
+		resto1.addDish("MainDish", "pat�", "glutenFree", 4.5);
+		resto1.createMeal("MyMeal", "HalfMeal");
+		resto1.getMealByName("MyMeal").addDish(resto1.getDishByName("pat�"));
+		
+		custo1.createOrder("myOrder",resto1);
+		custo1.getOrderByName("myOrder").add(resto1.getDishByName("pat�"));
+		custo1.getOrderByName("myOrder").add(resto1.getMealByName("MyMeal"));
+		
+		clui.executeCommand("login jacquo 123456789");
+		clui.executeCommand("registerRestaurant 0123456789 resto resto mail password 0.01,0.02");
+		clui.executeCommand("registerCustomer 0123456789 custo custo mail password 0.01,0.02 22/03/1995");
+		clui.executeCommand("registerCourier 0123456789 resto1 resto1 mail password 0.01,0.02 22/03/1995");
+		*/
+		clui.launchClui();
+	}
+
+}
diff --git a/src/Core/MyFoodora.java b/src/Core/MyFoodora.java
index 7a74289..ad7bd1f 100644
--- a/src/Core/MyFoodora.java
+++ b/src/Core/MyFoodora.java
@@ -1,20 +1,8 @@
 package Core;
 
-import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.TimeZone;
-
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
 import Exception.ExceptionUnknownStartegyType;
-import Item.Dish;
-import Item.FactoryDish;
-import Item.FactoryMeal;
-import Item.Meal;
 import Order.HistoricOrder;
 import Order.Order;
 import StrategyProfit.ContextTargetProfitStrategy;
@@ -28,9 +16,14 @@ import DeliveryStrategy.ContextDeliveryStrategy;
 
 /**
  * Heart of the project, concatenate all the functionalities this project
- * must have.
+ * must have. This class should be unique and contain the entire foodora system.
+ * It also implement a lot of method which allow users to modify itself.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
  *
  */
+
+
 public class MyFoodora {
 	
 	public static final int UNKNOWN = 0;
diff --git a/src/DeliveryStrategy/ContextDeliveryStartegy.java b/src/DeliveryStrategy/ContextDeliveryStartegy.java
deleted file mode 100644
index 88a80bc..0000000
--- a/src/DeliveryStrategy/ContextDeliveryStartegy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package DeliveryStrategy;
-
-import Core.ContextStrategy;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownStartegyType;
-import StrategyProfit.StrategyTargetProfitPolicy;
-import StrategyProfit.TargetProfitDeliveryCost;
-import StrategyProfit.TargetProfitMarkup;
-import StrategyProfit.TargetProfitServiceFee;
-
-public class ContextDeliveryStartegy implements ContextStrategy {
-
-	private StrategyTargetProfitPolicy strategy;
-	
-	public ContextDeliveryStartegy(String strategyName) throws ExceptionUnknownStartegyType {
-		setStrategy(strategyName);
-	}
-	
-	public void setStrategy(String strategyName) throws ExceptionUnknownStartegyType{
-		strategyName = strategyName.toLowerCase().trim();
-		switch(strategyName){
-		case "deliverycost":
-			strategy = new TargetProfitDeliveryCost();
-			break;
-		case "servicefee":
-			strategy = new TargetProfitServiceFee();
-			break;
-		case "markup":
-			strategy = new TargetProfitMarkup();
-			break;
-		default:
-			throw new ExceptionUnknownStartegyType("Unknown startegy '"+strategyName+"', DeliveryCost, ServiceFee and Markup available.");
-		}
-	}
-	
-	public void execute(MyFoodora myFoodora, double targetProfit){
-		strategy.chooseTargetProfit(myFoodora, targetProfit);
-	}
-
-}
diff --git a/src/DeliveryStrategy/ContextDeliveryStrategy.java b/src/DeliveryStrategy/ContextDeliveryStrategy.java
index 391d98b..4a01ee3 100644
--- a/src/DeliveryStrategy/ContextDeliveryStrategy.java
+++ b/src/DeliveryStrategy/ContextDeliveryStrategy.java
@@ -1,49 +1,51 @@
-package DeliveryStrategy;
-
-import Core.ContextStrategy;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownStartegyType;
-import StrategyProfit.StrategyTargetProfitPolicy;
-import StrategyProfit.TargetProfitDeliveryCost;
-import StrategyProfit.TargetProfitMarkup;
-import StrategyProfit.TargetProfitServiceFee;
-
-public class ContextDeliveryStrategy implements ContextStrategy {
-
-	private StrategyDeliveryPolicy strategy;
-	
-	public ContextDeliveryStrategy(String strategyName) throws ExceptionUnknownStartegyType {
-		setStrategy(strategyName);
-	}
-	
-	@Override
-	public void setStrategy(String strategyName) throws ExceptionUnknownStartegyType{
-		strategyName = strategyName.toLowerCase().trim();
-		switch(strategyName){
-		case "fairoccupation":
-			strategy = new FairOccupationDelivery();
-			break;
-		case "fastestdelivery":
-			strategy = new FastestDelivery();
-			break;
-		default:
-			throw new ExceptionUnknownStartegyType("Unknown startegy '"+strategyName+"', FairOccupation, FastestDelivery available.");
-		}
-	}
-	
-	@Override
-	public String toString() {
-		return strategy.getNameOfStrategy().toString();
-	}
-
-	public StrategyDeliveryPolicy getStrategy() {
-		return strategy;
-	}
-
-	public void setStrategy(StrategyDeliveryPolicy strategy) {
-		this.strategy = strategy;
-	}
-	
-	
-
-}
+package DeliveryStrategy;
+
+import Core.ContextStrategy;
+import Exception.ExceptionUnknownStartegyType;
+
+/**
+ * Create a context outside foodora to manager and execute strategyDelivery
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class ContextDeliveryStrategy implements ContextStrategy {
+
+	private StrategyDeliveryPolicy strategy;
+	
+	public ContextDeliveryStrategy(String strategyName) throws ExceptionUnknownStartegyType {
+		setStrategy(strategyName);
+	}
+	
+	@Override
+	public void setStrategy(String strategyName) throws ExceptionUnknownStartegyType{
+		strategyName = strategyName.toLowerCase().trim();
+		switch(strategyName){
+		case "fairoccupation":
+			strategy = new FairOccupationDelivery();
+			break;
+		case "fastestdelivery":
+			strategy = new FastestDelivery();
+			break;
+		default:
+			throw new ExceptionUnknownStartegyType("Unknown startegy '"+strategyName+"', FairOccupation, FastestDelivery available.");
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return strategy.getNameOfStrategy().toString();
+	}
+
+	public StrategyDeliveryPolicy getStrategy() {
+		return strategy;
+	}
+
+	public void setStrategy(StrategyDeliveryPolicy strategy) {
+		this.strategy = strategy;
+	}
+	
+	
+
+}
diff --git a/src/DeliveryStrategy/FairOccupationDelivery.java b/src/DeliveryStrategy/FairOccupationDelivery.java
index ce92f66..8b21c00 100644
--- a/src/DeliveryStrategy/FairOccupationDelivery.java
+++ b/src/DeliveryStrategy/FairOccupationDelivery.java
@@ -6,6 +6,13 @@ import User.Courier;
 import User.Customer;
 import User.Restaurant;
 
+/**
+ * Tend to give equally orders to all Couriers.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class FairOccupationDelivery extends StrategyDeliveryPolicy {
 
 
diff --git a/src/DeliveryStrategy/FastestDelivery.java b/src/DeliveryStrategy/FastestDelivery.java
index 948dbfe..77e6062 100644
--- a/src/DeliveryStrategy/FastestDelivery.java
+++ b/src/DeliveryStrategy/FastestDelivery.java
@@ -8,6 +8,13 @@ import User.Courier;
 import User.Customer;
 import User.Restaurant;
 
+/**
+ * Will give the order to the nearest courier.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class FastestDelivery extends StrategyDeliveryPolicy{
 
 	protected String nameOfStrategy;
diff --git a/src/DeliveryStrategy/StrategyDeliveryPolicy.java b/src/DeliveryStrategy/StrategyDeliveryPolicy.java
index e08b9a7..ac2505c 100644
--- a/src/DeliveryStrategy/StrategyDeliveryPolicy.java
+++ b/src/DeliveryStrategy/StrategyDeliveryPolicy.java
@@ -6,6 +6,13 @@ import User.Courier;
 import User.Customer;
 import User.Restaurant;
 
+/**
+ * Abstract Class of the strategy Delivery
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public abstract class StrategyDeliveryPolicy {
 	
 	
diff --git a/src/Exception/ExceptionUnknownStartegyType.java b/src/Exception/ExceptionUnknownStartegyType.java
index 866da06..9cea0bc 100644
--- a/src/Exception/ExceptionUnknownStartegyType.java
+++ b/src/Exception/ExceptionUnknownStartegyType.java
@@ -1,35 +1,35 @@
-package Exception;
-
-public class ExceptionUnknownStartegyType extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7678301440060327944L;
-
-	public ExceptionUnknownStartegyType() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownStartegyType(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownStartegyType(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownStartegyType(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownStartegyType(String message, Throwable cause, boolean enableSuppression,
-			boolean writableStackTrace) {
-		super(message, cause, enableSuppression, writableStackTrace);
-		// TODO Auto-generated constructor stub
-	}
-
-}
+package Exception;
+
+public class ExceptionUnknownStartegyType extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7678301440060327944L;
+
+	public ExceptionUnknownStartegyType() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownStartegyType(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownStartegyType(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownStartegyType(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownStartegyType(String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/src/Exception/ExceptionUnknownTypeOfUser.java b/src/Exception/ExceptionUnknownTypeOfUser.java
index 4f10522..05e6da5 100644
--- a/src/Exception/ExceptionUnknownTypeOfUser.java
+++ b/src/Exception/ExceptionUnknownTypeOfUser.java
@@ -1,38 +1,38 @@
-package Exception;
-
-public class ExceptionUnknownTypeOfUser extends Exception {
-
-	
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 147789654641165L;
-
-	public ExceptionUnknownTypeOfUser() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownTypeOfUser(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownTypeOfUser(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownTypeOfUser(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ExceptionUnknownTypeOfUser(String message, Throwable cause, boolean enableSuppression,
-			boolean writableStackTrace) {
-		super(message, cause, enableSuppression, writableStackTrace);
-		// TODO Auto-generated constructor stub
-	}
-	
-	
-}
+package Exception;
+
+public class ExceptionUnknownTypeOfUser extends Exception {
+
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 147789654641165L;
+
+	public ExceptionUnknownTypeOfUser() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownTypeOfUser(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownTypeOfUser(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownTypeOfUser(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public ExceptionUnknownTypeOfUser(String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+		// TODO Auto-generated constructor stub
+	}
+	
+	
+}
diff --git a/src/Item/Dish.java b/src/Item/Dish.java
index bca9701..82030b2 100644
--- a/src/Item/Dish.java
+++ b/src/Item/Dish.java
@@ -1,63 +1,71 @@
-package Item;
-
-public class Dish extends Item{
-	
-	private String typeInMeal;
-	private double price;
-	private long nbOfSell;
-	
-	/** CONSTURCTOR **/
-	
-	public Dish(String name, String typeOfFood, double _price) {
-		super(name, typeOfFood);
-		price = _price;
-		this.nbOfSell = 0;
-	}
-	
-	/** GETTER AND SETTER **/
-	
-	
-	
-	
-	
-	public String getTypeInMeal() {
-		return typeInMeal;
-	}
-	public long getNbOfSell() {
-		return nbOfSell;
-	}
-
-	public void setNbOfSell(long nbOfSell) {
-		this.nbOfSell = nbOfSell;
-	}
-
-	protected void setTypeInMeal(String _typeInMeal) {
-		this.typeInMeal = _typeInMeal;
-	}
-	public double getPrice() {
-		return price;
-	}
-	public void setPrice(double _price) {
-		this.price = _price;
-	}
-	
-	/** OVERRIDE **/
-	@Override
-	public boolean equals(Object d){
-		if(d instanceof Dish){
-			Dish dish = (Dish) d;
-			if(dish.getPrice()==price && dish.getName()==name && dish.getTypeOfFood()==typeOfFood && dish.getTypeInMeal()==typeInMeal)
-				return true;
-		}
-		return false;
-	}
-	@Override
-	public String toString(){
-		String s="";
-		s+="\nName : "+name;
-		s+=", type of food : "+typeOfFood;
-		s+=", type : "+typeInMeal;
-		s+=", price : "+price;
-		return s;
-	}
-}
+package Item;
+
+/**
+ * Dish are basic item, they are mixed to create meal but Customers
+ * are able to chose them.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class Dish extends Item{
+	
+	private String typeInMeal;
+	private double price;
+	private long nbOfSell;
+	
+	/** CONSTURCTOR **/
+	
+	public Dish(String name, String typeOfFood, double _price) {
+		super(name, typeOfFood);
+		price = _price;
+		this.nbOfSell = 0;
+	}
+	
+	/** GETTER AND SETTER **/
+	
+	
+	
+	
+	
+	public String getTypeInMeal() {
+		return typeInMeal;
+	}
+	public long getNbOfSell() {
+		return nbOfSell;
+	}
+
+	public void setNbOfSell(long nbOfSell) {
+		this.nbOfSell = nbOfSell;
+	}
+
+	protected void setTypeInMeal(String _typeInMeal) {
+		this.typeInMeal = _typeInMeal;
+	}
+	public double getPrice() {
+		return price;
+	}
+	public void setPrice(double _price) {
+		this.price = _price;
+	}
+	
+	/** OVERRIDE **/
+	@Override
+	public boolean equals(Object d){
+		if(d instanceof Dish){
+			Dish dish = (Dish) d;
+			if(dish.getPrice()==price && dish.getName()==name && dish.getTypeOfFood()==typeOfFood && dish.getTypeInMeal()==typeInMeal)
+				return true;
+		}
+		return false;
+	}
+	@Override
+	public String toString(){
+		String s="";
+		s+="\nName : "+name;
+		s+=", type of food : "+typeOfFood;
+		s+=", type : "+typeInMeal;
+		s+=", price : "+price;
+		return s;
+	}
+}
diff --git a/src/Item/FactoryDish.java b/src/Item/FactoryDish.java
index 2e526cc..f59bc75 100644
--- a/src/Item/FactoryDish.java
+++ b/src/Item/FactoryDish.java
@@ -1,19 +1,27 @@
-package Item;
-
-import Exception.ExceptionUnknownDishType;
-
-public class FactoryDish {
-	public Dish createDish(String typeInMeal, String _name, String _typeOfFood, double _price) throws ExceptionUnknownDishType{
-		typeInMeal=typeInMeal.toLowerCase().trim();
-		switch(typeInMeal){
-		case "dessert":
-			return new Dessert(_name,_typeOfFood,_price);
-		case "maindish":
-			return new MainDish(_name,_typeOfFood,_price);
-		case "starter":
-			return new Starter(_name,_typeOfFood,_price);
-		default:
-			throw new ExceptionUnknownDishType("Error, '"+typeInMeal+"' is unkwon, try Dessert, MainDish or Starter.");
-		} 
-	}
-}
+package Item;
+
+import Exception.ExceptionUnknownDishType;
+
+/**
+ * This factory allow us to create generic type of food as we want to,
+ * it's then easy to add a Drink category if we want to.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class FactoryDish {
+	public Dish createDish(String typeInMeal, String _name, String _typeOfFood, double _price) throws ExceptionUnknownDishType{
+		typeInMeal=typeInMeal.toLowerCase().trim();
+		switch(typeInMeal){
+		case "dessert":
+			return new Dessert(_name,_typeOfFood,_price);
+		case "maindish":
+			return new MainDish(_name,_typeOfFood,_price);
+		case "starter":
+			return new Starter(_name,_typeOfFood,_price);
+		default:
+			throw new ExceptionUnknownDishType("Error, '"+typeInMeal+"' is unkwon, try Dessert, MainDish or Starter.");
+		} 
+	}
+}
diff --git a/src/Item/FactoryMeal.java b/src/Item/FactoryMeal.java
index e6ec677..3da9641 100644
--- a/src/Item/FactoryMeal.java
+++ b/src/Item/FactoryMeal.java
@@ -2,6 +2,13 @@ package Item;
 
 import Exception.ExceptionUnknownMealType;
 
+/**
+ * This Factory allow Restaurant to create generic Meals.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class FactoryMeal {
 
 	public Meal createMeal(String nameOfMeal, String typeOfMeal) throws ExceptionUnknownMealType{
diff --git a/src/Item/FullMeal.java b/src/Item/FullMeal.java
index de047d4..26adf48 100644
--- a/src/Item/FullMeal.java
+++ b/src/Item/FullMeal.java
@@ -3,6 +3,13 @@ package Item;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+/**
+ * Type of full meal containing starter, mainDish and dessert.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class FullMeal extends Meal {
 	
 
diff --git a/src/Item/HalfMeal.java b/src/Item/HalfMeal.java
index 1a5bd1c..1e237f9 100644
--- a/src/Item/HalfMeal.java
+++ b/src/Item/HalfMeal.java
@@ -3,6 +3,13 @@ package Item;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+/**
+ * Type oh half meal contains MainDish and either starter or dessert.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class HalfMeal extends Meal {
 
 
diff --git a/src/Item/Item.java b/src/Item/Item.java
index 0ec0bb6..cc7a48f 100644
--- a/src/Item/Item.java
+++ b/src/Item/Item.java
@@ -2,6 +2,13 @@ package Item;
 
 import Order.HistoricOrder;
 
+/**
+ * An item is an abstraction of a meal or a dish.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public abstract class Item {
 	
 	String typeOfFood;
diff --git a/src/Item/Meal.java b/src/Item/Meal.java
index 8620226..715ebc2 100644
--- a/src/Item/Meal.java
+++ b/src/Item/Meal.java
@@ -1,142 +1,139 @@
-package Item;
-
-import java.util.ArrayList;
-
-import Order.Order;
-
-
-/**
- * 
- * This Meal class is created by the use of a pattern given in the constructor of
- * subClasses, this pattern must consist on an array, each case contain an obligatory
- * typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
- * it can be implemented by using a subArray.
- * For exemple, the patterns below show how a full meal may be created and then a half meal :
- * fullMealPattern={{"Starter"},{"MainDish"},{"Dessert"}}
- * halfMealPattern={{"Starter","Dessert"},{"MainDish"}}
- * 
- * We may create a children meal very easily :
- * chlidrenMealPattern={{"MainDish"},{"Dessert"},{"Drink"}}
- *
- */
-public abstract class Meal extends Item{
-	
-	ArrayList<Dish> listDish = null;
-	String [][] patternTypeInMeal;
-	protected String typeOfMeal;
-	protected long nbOfSell;
-	
-	private double price=0;
-	
-	/** CONSTRUCTORS **/
-	
-	public Meal(String name,String typeOfFood) {
-		super(name,typeOfFood);
-		this.nbOfSell = 0;
-		this.listDish = new ArrayList<Dish>();
-	}
-	
-	/** add and remove dishes **/
-	
-	public void addDish(Dish dish){
-		int idInMenu=-1;
-		int idInMenuInc=0;
-		for(String[] tabOfType : this.getPatternTypeInMeal()){
-			for(String typeFromPatternType : tabOfType){
-				if(typeFromPatternType.toLowerCase().equals(dish.getTypeInMeal().toLowerCase())){
-					idInMenu=idInMenuInc;
-				}
-			}
-			idInMenuInc+=1;
-		}
-		if(idInMenu>-1){
-			this.listDish.set(idInMenu, dish);
-		}
-	}
-	
-	public void removeDish(String name){
-		boolean itemRemoved = false;
-		Dish dishToRemove = null;
-		for(Dish dish: listDish){
-			if(dish.getName()==name){
-				dishToRemove = dish;
-				itemRemoved=true;
-			}
-		}
-		if(dishToRemove != null){
-			listDish.remove(dishToRemove);
-		}
-		if(itemRemoved)
-			System.out.println("Dish removed !");
-	}
-	public void removeDish(int num){
-		Dish dish = listDish.get(num);
-		if(dish.getName()==name)
-			if(!listDish.contains(dish))
-				listDish.add(dish);
-			else{
-				System.out.println("This dish is in this menu.");
-				if(Cli.Confirm.text("Do you really want to add it ?"))
-					listDish.add(dish);
-			}
-	}
-	
-	/** GETTER AND SETTER **/
-	
-	
-	
-	public String getTypeOfMeal() {
-		return typeOfMeal;
-	}
-	public long getNbOfSell() {
-		return nbOfSell;
-	}
-
-	public void setNbOfSell(long nbOfSell) {
-		this.nbOfSell = nbOfSell;
-	}
-
-	protected void setTypeOfMeal(String _typeOfMeal) {
-		this.typeOfMeal = _typeOfMeal;
-	}
-	public double getPrice(){
-		price = 0;
-		for(Dish dish : listDish){
-			if(dish!=null)
-				price+=dish.getPrice();
-		}
-		return price;
-	}
-	public ArrayList<Dish> getListDish() {
-		return listDish;
-	}
-	public String[][] getPatternTypeInMeal() {
-		return patternTypeInMeal;
-	}
-	protected void setPatternTypeInMeal(String[][] patternTypeInMeal) {
-		this.patternTypeInMeal = patternTypeInMeal;
-	}
-
-	
-	/** OVERRIDE **/
-	@Override
-	public boolean equals(Object m){
-		if(m instanceof Meal){
-			Meal meal = (Meal) m;
-			if(meal.getTypeOfMeal()==typeOfMeal)
-				return true;
-		}
-		return false;
-	}
-	@Override
-	public String toString(){
-		String s="";
-		s+="\n***\nMenu : "+name;
-		s+=", this Menu contain : ";
-		for(Dish d:listDish){
-			if(d != null)
-				s+=d.toString();
-		}
-		return s;
-	}
-}
+package Item;
+
+import java.util.ArrayList;
+
+/**
+ * This Meal class is created by the use of a pattern given in the constructor of
+ * subClasses, this pattern must consist on an array, each case contain an obligatory
+ * typeOfMeal (starter,mainDish...), if the user have the choice between two typeOfMeal
+ * it can be implemented by using a subArray.
+ * For exemple, the patterns below show how a full meal may be created and then a half meal :
+ * fullMealPattern={{"Starter"},{"MainDish"},{"Dessert"}}
+ * halfMealPattern={{"Starter","Dessert"},{"MainDish"}}
+ * 
+ * We may create a children meal very easily :
+ * chlidrenMealPattern={{"MainDish"},{"Dessert"},{"Drink"}}
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public abstract class Meal extends Item{
+	
+	ArrayList<Dish> listDish = null;
+	String [][] patternTypeInMeal;
+	protected String typeOfMeal;
+	protected long nbOfSell;
+	
+	private double price=0;
+	
+	/** CONSTRUCTORS **/
+	
+	public Meal(String name,String typeOfFood) {
+		super(name,typeOfFood);
+		this.nbOfSell = 0;
+		this.listDish = new ArrayList<Dish>();
+	}
+	
+	/** add and remove dishes **/
+	
+	public void addDish(Dish dish){
+		int idInMenu=-1;
+		int idInMenuInc=0;
+		for(String[] tabOfType : this.getPatternTypeInMeal()){
+			for(String typeFromPatternType : tabOfType){
+				if(typeFromPatternType.toLowerCase().equals(dish.getTypeInMeal().toLowerCase())){
+					idInMenu=idInMenuInc;
+				}
+			}
+			idInMenuInc+=1;
+		}
+		if(idInMenu>-1){
+			this.listDish.set(idInMenu, dish);
+		}
+	}
+	
+	public void removeDish(String name){
+		boolean itemRemoved = false;
+		Dish dishToRemove = null;
+		for(Dish dish: listDish){
+			if(dish.getName()==name){
+				dishToRemove = dish;
+				itemRemoved=true;
+			}
+		}
+		if(dishToRemove != null){
+			listDish.remove(dishToRemove);
+		}
+		if(itemRemoved)
+			System.out.println("Dish removed !");
+	}
+	public void removeDish(int num){
+		Dish dish = listDish.get(num);
+		if(dish.getName()==name)
+			if(!listDish.contains(dish))
+				listDish.add(dish);
+			else{
+				listDish.add(dish);
+			}
+	}
+	
+	/** GETTER AND SETTER **/
+	
+	
+	
+	public String getTypeOfMeal() {
+		return typeOfMeal;
+	}
+	public long getNbOfSell() {
+		return nbOfSell;
+	}
+
+	public void setNbOfSell(long nbOfSell) {
+		this.nbOfSell = nbOfSell;
+	}
+
+	protected void setTypeOfMeal(String _typeOfMeal) {
+		this.typeOfMeal = _typeOfMeal;
+	}
+	public double getPrice(){
+		price = 0;
+		for(Dish dish : listDish){
+			if(dish!=null)
+				price+=dish.getPrice();
+		}
+		return price;
+	}
+	public ArrayList<Dish> getListDish() {
+		return listDish;
+	}
+	public String[][] getPatternTypeInMeal() {
+		return patternTypeInMeal;
+	}
+	protected void setPatternTypeInMeal(String[][] patternTypeInMeal) {
+		this.patternTypeInMeal = patternTypeInMeal;
+	}
+
+	
+	/** OVERRIDE **/
+	@Override
+	public boolean equals(Object m){
+		if(m instanceof Meal){
+			Meal meal = (Meal) m;
+			if(meal.getTypeOfMeal()==typeOfMeal)
+				return true;
+		}
+		return false;
+	}
+	@Override
+	public String toString(){
+		String s="";
+		s+="\n***\nMenu : "+name;
+		s+=", this Menu contain : ";
+		for(Dish d:listDish){
+			if(d != null)
+				s+=d.toString();
+		}
+		return s;
+	}
+}
diff --git a/src/Item/MealFactory.java b/src/Item/MealFactory.java
index 2e78188..6c7eb5c 100644
--- a/src/Item/MealFactory.java
+++ b/src/Item/MealFactory.java
@@ -1,5 +1,12 @@
 package Item;
 
+/**
+ * This Factory allow Restaurant to create generic Meals.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class MealFactory {
 
 	public Meal createMeal(String typeOfMeal, String _name, String _typeOfFood){
diff --git a/src/Offers/BirthdayOffer.java b/src/Offers/BirthdayOffer.java
index e9e5184..77fc104 100644
--- a/src/Offers/BirthdayOffer.java
+++ b/src/Offers/BirthdayOffer.java
@@ -1,60 +1,66 @@
-package Offers;
-
-import java.util.ArrayList;
-
-import Item.Meal;
-import User.Restaurant;
-
-public class BirthdayOffer implements ObservableOffer {
-
-	
-	
-	private boolean state;
-	private ArrayList<Observer> observers = new ArrayList<Observer>();
-	
-	
-	
-	public BirthdayOffer(boolean state, ArrayList<Observer> observers) {
-		super();
-		this.state = true;
-		this.observers = new ArrayList<Observer>();
-	}
-
-	@Override
-	public void attachObserver(Observer o) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void detachObserver(Observer o) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public boolean isState() {
-		return state;
-	}
-
-	public void setState(boolean state) {
-		this.state = state;
-	}
-
-	public ArrayList<Observer> getObservers() {
-		return observers;
-	}
-
-	public void setObservers(ArrayList<Observer> observers) {
-		this.observers = observers;
-	}
-
-	@Override
-	public void notifyObservers(Restaurant r) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	
-	
-
-}
+package Offers;
+
+import java.util.ArrayList;
+
+import User.Restaurant;
+
+/**
+ * Gives a promotion when it's the customer's birthday
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class BirthdayOffer implements ObservableOffer {
+
+	
+	
+	private boolean state;
+	private ArrayList<Observer> observers = new ArrayList<Observer>();
+	
+	
+	
+	public BirthdayOffer(boolean state, ArrayList<Observer> observers) {
+		super();
+		this.state = true;
+		this.observers = new ArrayList<Observer>();
+	}
+
+	@Override
+	public void attachObserver(Observer o) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void detachObserver(Observer o) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public boolean isState() {
+		return state;
+	}
+
+	public void setState(boolean state) {
+		this.state = state;
+	}
+
+	public ArrayList<Observer> getObservers() {
+		return observers;
+	}
+
+	public void setObservers(ArrayList<Observer> observers) {
+		this.observers = observers;
+	}
+
+	@Override
+	public void notifyObservers(Restaurant r) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	
+	
+
+}
diff --git a/src/Offers/MealOfTheWeek.java b/src/Offers/MealOfTheWeek.java
index 75a6772..26ff192 100644
--- a/src/Offers/MealOfTheWeek.java
+++ b/src/Offers/MealOfTheWeek.java
@@ -1,97 +1,106 @@
-package Offers;
-
-import java.util.ArrayList;
-
-import Item.Meal;
-import User.Restaurant;
-
-public class MealOfTheWeek implements ObservableOffer {
-	
-	
-	private boolean state;
-	private Meal meal;
-	private boolean changed;
-	private ArrayList<Observer> observers = new ArrayList<Observer>();
-	
-	
-	
-	
-	
-	public MealOfTheWeek(Meal meal) {
-		super();
-		this.state = true;
-		this.meal = meal;
-		this.changed = false;
-		this.observers = new ArrayList<Observer>();
-	}
-	
-	
-
-	public boolean isState() {
-		return state;
-	}
-
-
-
-	public void setState(boolean state) {
-		this.state = state;
-	}
-
-
-
-	public Meal getMeal() {
-		return meal;
-	}
-
-
-
-	public void setMeal(Meal meal) {
-		this.meal = meal;
-	}
-
-
-
-	@Override
-	public void attachObserver(Observer o) {
-		this.observers.add(o);
-
-	}
-
-	@Override
-	public void detachObserver(Observer o) {
-		this.observers.remove(o);
-
-	}
-	
-	
-
-	public ArrayList<Observer> getObservers() {
-		return observers;
-	}
-
-
-
-	public void setObservers(ArrayList<Observer> observers) {
-		this.observers = observers;
-	}
-
-	@Override
-	public void notifyObservers(Restaurant r) {
-		if(this.changed){
-			for (Observer observer : this.observers) {
-				String message = "A new Offer Meal Of The Week is Available in the Restaurant : " + r.getName() + "\n "
-						+ "Meal : " + this.meal.toString();
-				observer.update(message);
-			}
-		this.changed=false;
-		}
-	}
-		
-	public void setInterests(Restaurant r){
-		this.changed=true;
-		this.notifyObservers(r);
-	}
-
-}
-
-
+package Offers;
+
+import java.util.ArrayList;
+
+import Item.Meal;
+import User.Restaurant;
+
+/**
+ * This class is attached to a unique meal for a restaurant.
+ * It's also attached to a list of customers, if a meal is attached,
+ * when the user log in, he/she receive an offer from this class.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class MealOfTheWeek implements ObservableOffer {
+	
+	
+	private boolean state;
+	private Meal meal;
+	private boolean changed;
+	private ArrayList<Observer> observers = new ArrayList<Observer>();
+	
+	
+	
+	
+	
+	public MealOfTheWeek(Meal meal) {
+		super();
+		this.state = true;
+		this.meal = meal;
+		this.changed = false;
+		this.observers = new ArrayList<Observer>();
+	}
+	
+	
+
+	public boolean isState() {
+		return state;
+	}
+
+
+
+	public void setState(boolean state) {
+		this.state = state;
+	}
+
+
+
+	public Meal getMeal() {
+		return meal;
+	}
+
+
+
+	public void setMeal(Meal meal) {
+		this.meal = meal;
+	}
+
+
+
+	@Override
+	public void attachObserver(Observer o) {
+		this.observers.add(o);
+
+	}
+
+	@Override
+	public void detachObserver(Observer o) {
+		this.observers.remove(o);
+
+	}
+	
+	
+
+	public ArrayList<Observer> getObservers() {
+		return observers;
+	}
+
+
+
+	public void setObservers(ArrayList<Observer> observers) {
+		this.observers = observers;
+	}
+
+	@Override
+	public void notifyObservers(Restaurant r) {
+		if(this.changed){
+			for (Observer observer : this.observers) {
+				String message = "A new Offer Meal Of The Week is Available in the Restaurant : " + r.getName() + "\n "
+						+ "Meal : " + this.meal.toString();
+				observer.update(message);
+			}
+		this.changed=false;
+		}
+	}
+		
+	public void setInterests(Restaurant r){
+		this.changed=true;
+		this.notifyObservers(r);
+	}
+
+}
+
+
diff --git a/src/Offers/ObservableOffer.java b/src/Offers/ObservableOffer.java
index 4952c24..a75e54a 100644
--- a/src/Offers/ObservableOffer.java
+++ b/src/Offers/ObservableOffer.java
@@ -1,12 +1,12 @@
-package Offers;
-
-import User.Restaurant;
-
-public interface ObservableOffer {
-	
-	public abstract void attachObserver(Observer o);
-	public abstract void detachObserver(Observer o);
-	public abstract void notifyObservers(Restaurant r);
-
-
-}
+package Offers;
+
+import User.Restaurant;
+
+public interface ObservableOffer {
+	
+	public abstract void attachObserver(Observer o);
+	public abstract void detachObserver(Observer o);
+	public abstract void notifyObservers(Restaurant r);
+
+
+}
diff --git a/src/Offers/Observer.java b/src/Offers/Observer.java
index b456789..5fdff8a 100644
--- a/src/Offers/Observer.java
+++ b/src/Offers/Observer.java
@@ -1,7 +1,7 @@
-package Offers;
-
-public interface Observer {
-	
-	public void update(String offer);
-
-}
+package Offers;
+
+public interface Observer {
+	
+	public void update(String offer);
+
+}
diff --git a/src/Order/HistoricOrder.java b/src/Order/HistoricOrder.java
index 06864d4..a573cb2 100644
--- a/src/Order/HistoricOrder.java
+++ b/src/Order/HistoricOrder.java
@@ -1,31 +1,38 @@
-package Order;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-public class HistoricOrder {
-	
-	private ArrayList<Order> listOrder;
-	
-	public HistoricOrder() {
-		listOrder = new ArrayList<Order>();
-	}
-	public void addOrder(Order o){
-		listOrder.add(o);
-	}
-	public ArrayList<Order> getOrdered(){
-		Collections.sort(listOrder);
-		return listOrder;
-	}
-	@Override
-	public String toString() {
-		return "HistoricOrder [listOrder=" + listOrder + "]";
-	}
-	public ArrayList<Order> getListOrder() {
-		return listOrder;
-	}
-	
-	
-	
-
-}
+package Order;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * A generic historic of order, used by some users and foodora.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class HistoricOrder {
+	
+	private ArrayList<Order> listOrder;
+	
+	public HistoricOrder() {
+		listOrder = new ArrayList<Order>();
+	}
+	public void addOrder(Order o){
+		listOrder.add(o);
+	}
+	public ArrayList<Order> getOrdered(){
+		Collections.sort(listOrder);
+		return listOrder;
+	}
+	@Override
+	public String toString() {
+		return "HistoricOrder [listOrder=" + listOrder + "]";
+	}
+	public ArrayList<Order> getListOrder() {
+		return listOrder;
+	}
+	
+	
+	
+
+}
diff --git a/src/Order/Order.java b/src/Order/Order.java
index a58851f..dee16c1 100644
--- a/src/Order/Order.java
+++ b/src/Order/Order.java
@@ -1,256 +1,265 @@
-package Order;
-
-import java.util.ArrayList;
-import java.util.Date;
-
-import Core.MyFoodora;
-import Item.Dish;
-import Item.Item;
-import Item.Meal;
-import Item.VisitablePrice;
-import Item.VisitorPrice;
-import Offers.MealOfTheWeek;
-import Others.Period;
-import User.Restaurant;
-
-public class Order implements Comparable<Order>{
-	
-	private double price;
-	private Others.Date date;
-	private boolean finalized;
-	private String nameOrder;
-	private Restaurant restaurantAttached;
-
-	public String getNameOrder() {
-		return nameOrder;
-	}
-
-	ArrayList<Dish> listDish;
-	ArrayList<Meal> listMeal;
-	
-	public Order() {
-		super();
-		
-		this.listDish = new ArrayList<Dish>();
-		this.listMeal = new ArrayList<Meal>();
-	}
-	
-	public Order(String _name, Restaurant _restaurant) {
-		super();
-		
-		this.listDish = new ArrayList<Dish>();
-		this.listMeal = new ArrayList<Meal>();
-		this.nameOrder = _name;
-		this.restaurantAttached = _restaurant;
-	}
-
-	/** CUSTOM **/
-	
-	public void finalize(){
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		this.date = new Others.Date(theYear, theMonth, theDay);
-		finalized = true;
-	}
-	
-	public void finalize(MyFoodora foodora){
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		this.date = new Others.Date(theYear, theMonth, theDay);
-		finalized = true;
-		foodora.getOrderPendingList().add(this);
-	}
-	
-	public void finalize(MyFoodora foodora, Others.Date _date){
-		this.date = _date;
-		finalized = true;
-		foodora.getOrderPendingList().add(this);
-	}
-	
-	public static ArrayList<Order> getListOfOrderInAPeriod(HistoricOrder historic,Period period){
-		ArrayList<Order> listOrder = new ArrayList<Order>();
-		int beginDay = period.getBeginingOfPeriod().getIntDay();
-		int endDay = period.getEndOfPeriod().getIntDay();
-		int beginMonth = period.getBeginingOfPeriod().getIntMonth();
-		int endMonth = period.getEndOfPeriod().getIntMonth();
-		int beginYear = period.getBeginingOfPeriod().getIntYear();
-		int endYear = period.getEndOfPeriod().getIntYear();
-		for (Order order : historic.getListOrder()){
-			Others.Date dateOfOrder = order.getDate();
-			int dayOfOrder = dateOfOrder.getIntDay();
-			int monthOfOrder = dateOfOrder.getIntMonth();
-			int yearOfOrder = dateOfOrder.getIntYear();
-			if((beginYear < yearOfOrder)  & ( yearOfOrder < endYear)){
-				listOrder.add(order);
-			}
-
-			else if ((endYear == yearOfOrder)&(beginYear == yearOfOrder)){
-				if((beginMonth < monthOfOrder) & (monthOfOrder < endMonth)){
-					listOrder.add(order);
-				}
-				else if((beginMonth == monthOfOrder) & (endMonth == monthOfOrder)){
-					if((beginDay< dayOfOrder)&(dayOfOrder<endDay)){
-						listOrder.add(order);
-					}
-					else if ((endDay >= dayOfOrder) &(beginDay <= dayOfOrder)){
-						listOrder.add(order);
-					}
-				}
-				else if(beginMonth == monthOfOrder){
-					if(beginDay <= dayOfOrder){
-						listOrder.add(order);
-					}
-				}
-				else if(endMonth == monthOfOrder){
-					if(endDay >= dayOfOrder){
-						listOrder.add(order);
-					}
-				}
-			}
-			else if (beginYear == yearOfOrder){
-				if(beginMonth == monthOfOrder){
-					if (beginDay <= dayOfOrder){
-						listOrder.add(order);
-					}
-				}
-				else if(beginMonth < monthOfOrder){
-					listOrder.add(order);
-				}
-
-				
-			}
-			else if(endYear == yearOfOrder){
-				if(endMonth == monthOfOrder){
-					if(endDay >= dayOfOrder){
-						listOrder.add(order);
-					}
-				if (endMonth > monthOfOrder){
-					listOrder.add(order);
-				}
-				}
-			}
-			
-		}
-		
-		return listOrder;
-	}
-
-	/** ADD & REMOVE **/
-	
-	public void addItemByName(String string) {
-		Item item = this.restaurantAttached.getDishByName(string);
-		if(item != null)
-			this.add((Dish) item);
-		else{
-			item = this.restaurantAttached.getMealByName(string);
-			if(item != null)
-				this.add((Meal) item);
-			else
-				System.out.println("Unknown item.");
-		}
-	}
-	
-	public void add(Dish d){
-		listDish.add(d);
-		//price = price + d.getPrice();
-	}
-	public void add(Meal m){
-		listMeal.add(m);
-		//price = price + m.getPrice();
-	}
-	public void remove(Dish d){
-		listDish.remove(d);
-		//price = price - d.getPrice();
-	}
-	public void remove(Meal m){
-		listMeal.remove(m);
-		//price = price - m.getPrice();
-	}
-	public void removeDishById(int d){
-		listDish.remove(d);
-	}
-	public void removeMealById(int m){
-		listMeal.remove(m);
-	}
-	
-	/** GETTER AND SETTER **/
-	
-	
-	
-	public boolean isFinalised(){
-		return finalized;
-	}
-	public Restaurant getRestaurantAttached() {
-		return restaurantAttached;
-	}
-
-	public void setRestaurantAttached(Restaurant restaurantAttached) {
-		this.restaurantAttached = restaurantAttached;
-	}
-
-	public double getPrice(){
-		price = 0;
-		MealOfTheWeek mealOfTheWeekAttachedToRestaurant = restaurantAttached.getMealOfTheWeek();
-		String nameOfTheMealOfTheWeek = "";
-		if(mealOfTheWeekAttachedToRestaurant != null){
-			if(mealOfTheWeekAttachedToRestaurant.getMeal() != null){
-				for(Meal m : restaurantAttached.getListOfMeal()){
-					if(mealOfTheWeekAttachedToRestaurant.getMeal().getName().toLowerCase().equals(m.getName().toLowerCase())){
-						nameOfTheMealOfTheWeek = m.getName();
-					}
-				}
-			}
-		}
-		for(Meal meal : listMeal){
-			if(meal.getName().toLowerCase().equals(nameOfTheMealOfTheWeek.toLowerCase())){
-				price += meal.getPrice()*(1-restaurantAttached.getSpecialDiscountFactor());
-			}
-			else{
-				price += meal.getPrice()*(1-restaurantAttached.getGeneralDiscountFactor());
-			}
-		}
-		for(Dish dish : listDish){
-			price += dish.getPrice();
-		}
-		return price;
-	}
-	public void setPrice(double price) {
-		this.price = price;
-	}
-	public Others.Date getDate(){
-		return date;
-	}
-	
-	
-	public ArrayList<Dish> getListDish() {
-		return listDish;
-	}
-
-	public void setListDish(ArrayList<Dish> listDish) {
-		this.listDish = listDish;
-	}
-
-	public ArrayList<Meal> getListMeal() {
-		return listMeal;
-	}
-
-	public void setListMeal(ArrayList<Meal> listMeal) {
-		this.listMeal = listMeal;
-	}
-	
-	public String toString(){
-		return "\n***\n Order, name : "+nameOrder+", date : "+ date +"\n Dishs : "+ listDish + "\n Meals : " + listMeal;
-	}
-
-	public void setDate(Others.Date date) {
-		this.date = date;
-	}
-
-	@Override
-	public int compareTo(Order o) {
-		return 0;
-	}
-	
-}
+package Order;
+
+import java.util.ArrayList;
+import Core.MyFoodora;
+import Item.Dish;
+import Item.Item;
+import Item.Meal;
+import Offers.MealOfTheWeek;
+import Others.Period;
+import User.Restaurant;
+
+/**
+ * A customer have has many order he wants to, each order is attached to
+ * a restaurant and have numbers of his meals and dishes added by the customer.
+ * When the order is finalized, price is calculated according to the strategyProfit.
+ * Orders are also archived.
+ * A Courier is selected to transmit the order to the customer.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class Order implements Comparable<Order>{
+	
+	private double price;
+	private Others.Date date;
+	private boolean finalized;
+	private String nameOrder;
+	private Restaurant restaurantAttached;
+
+	public String getNameOrder() {
+		return nameOrder;
+	}
+
+	ArrayList<Dish> listDish;
+	ArrayList<Meal> listMeal;
+	
+	public Order() {
+		super();
+		
+		this.listDish = new ArrayList<Dish>();
+		this.listMeal = new ArrayList<Meal>();
+	}
+	
+	public Order(String _name, Restaurant _restaurant) {
+		super();
+		
+		this.listDish = new ArrayList<Dish>();
+		this.listMeal = new ArrayList<Meal>();
+		this.nameOrder = _name;
+		this.restaurantAttached = _restaurant;
+	}
+
+	/** CUSTOM **/
+	
+	@Override
+	public void finalize(){
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		this.date = new Others.Date(theYear, theMonth, theDay);
+		finalized = true;
+	}
+	
+	public void finalize(MyFoodora foodora){
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		this.date = new Others.Date(theYear, theMonth, theDay);
+		finalized = true;
+		foodora.getOrderPendingList().add(this);
+	}
+	
+	public void finalize(MyFoodora foodora, Others.Date _date){
+		this.date = _date;
+		finalized = true;
+		foodora.getOrderPendingList().add(this);
+	}
+	
+	public static ArrayList<Order> getListOfOrderInAPeriod(HistoricOrder historic,Period period){
+		ArrayList<Order> listOrder = new ArrayList<Order>();
+		int beginDay = period.getBeginingOfPeriod().getIntDay();
+		int endDay = period.getEndOfPeriod().getIntDay();
+		int beginMonth = period.getBeginingOfPeriod().getIntMonth();
+		int endMonth = period.getEndOfPeriod().getIntMonth();
+		int beginYear = period.getBeginingOfPeriod().getIntYear();
+		int endYear = period.getEndOfPeriod().getIntYear();
+		for (Order order : historic.getListOrder()){
+			Others.Date dateOfOrder = order.getDate();
+			int dayOfOrder = dateOfOrder.getIntDay();
+			int monthOfOrder = dateOfOrder.getIntMonth();
+			int yearOfOrder = dateOfOrder.getIntYear();
+			if((beginYear < yearOfOrder)  & ( yearOfOrder < endYear)){
+				listOrder.add(order);
+			}
+
+			else if ((endYear == yearOfOrder)&(beginYear == yearOfOrder)){
+				if((beginMonth < monthOfOrder) & (monthOfOrder < endMonth)){
+					listOrder.add(order);
+				}
+				else if((beginMonth == monthOfOrder) & (endMonth == monthOfOrder)){
+					if((beginDay< dayOfOrder)&(dayOfOrder<endDay)){
+						listOrder.add(order);
+					}
+					else if ((endDay >= dayOfOrder) &(beginDay <= dayOfOrder)){
+						listOrder.add(order);
+					}
+				}
+				else if(beginMonth == monthOfOrder){
+					if(beginDay <= dayOfOrder){
+						listOrder.add(order);
+					}
+				}
+				else if(endMonth == monthOfOrder){
+					if(endDay >= dayOfOrder){
+						listOrder.add(order);
+					}
+				}
+			}
+			else if (beginYear == yearOfOrder){
+				if(beginMonth == monthOfOrder){
+					if (beginDay <= dayOfOrder){
+						listOrder.add(order);
+					}
+				}
+				else if(beginMonth < monthOfOrder){
+					listOrder.add(order);
+				}
+
+				
+			}
+			else if(endYear == yearOfOrder){
+				if(endMonth == monthOfOrder){
+					if(endDay >= dayOfOrder){
+						listOrder.add(order);
+					}
+				if (endMonth > monthOfOrder){
+					listOrder.add(order);
+				}
+				}
+			}
+			
+		}
+		
+		return listOrder;
+	}
+
+	/** ADD & REMOVE **/
+	
+	public void addItemByName(String string) {
+		Item item = this.restaurantAttached.getDishByName(string);
+		if(item != null)
+			this.add((Dish) item);
+		else{
+			item = this.restaurantAttached.getMealByName(string);
+			if(item != null)
+				this.add((Meal) item);
+			else
+				System.out.println("Unknown item.");
+		}
+	}
+	
+	public void add(Dish d){
+		listDish.add(d);
+		//price = price + d.getPrice();
+	}
+	public void add(Meal m){
+		listMeal.add(m);
+		//price = price + m.getPrice();
+	}
+	public void remove(Dish d){
+		listDish.remove(d);
+		//price = price - d.getPrice();
+	}
+	public void remove(Meal m){
+		listMeal.remove(m);
+		//price = price - m.getPrice();
+	}
+	public void removeDishById(int d){
+		listDish.remove(d);
+	}
+	public void removeMealById(int m){
+		listMeal.remove(m);
+	}
+	
+	/** GETTER AND SETTER **/
+	
+	
+	
+	public boolean isFinalised(){
+		return finalized;
+	}
+	public Restaurant getRestaurantAttached() {
+		return restaurantAttached;
+	}
+
+	public void setRestaurantAttached(Restaurant restaurantAttached) {
+		this.restaurantAttached = restaurantAttached;
+	}
+
+	public double getPrice(){
+		price = 0;
+		MealOfTheWeek mealOfTheWeekAttachedToRestaurant = restaurantAttached.getMealOfTheWeek();
+		String nameOfTheMealOfTheWeek = "";
+		if(mealOfTheWeekAttachedToRestaurant != null){
+			if(mealOfTheWeekAttachedToRestaurant.getMeal() != null){
+				for(Meal m : restaurantAttached.getListOfMeal()){
+					if(mealOfTheWeekAttachedToRestaurant.getMeal().getName().toLowerCase().equals(m.getName().toLowerCase())){
+						nameOfTheMealOfTheWeek = m.getName();
+					}
+				}
+			}
+		}
+		for(Meal meal : listMeal){
+			if(meal.getName().toLowerCase().equals(nameOfTheMealOfTheWeek.toLowerCase())){
+				price += meal.getPrice()*(1-restaurantAttached.getSpecialDiscountFactor());
+			}
+			else{
+				price += meal.getPrice()*(1-restaurantAttached.getGeneralDiscountFactor());
+			}
+		}
+		for(Dish dish : listDish){
+			price += dish.getPrice();
+		}
+		return price;
+	}
+	public void setPrice(double price) {
+		this.price = price;
+	}
+	public Others.Date getDate(){
+		return date;
+	}
+	
+	
+	public ArrayList<Dish> getListDish() {
+		return listDish;
+	}
+
+	public void setListDish(ArrayList<Dish> listDish) {
+		this.listDish = listDish;
+	}
+
+	public ArrayList<Meal> getListMeal() {
+		return listMeal;
+	}
+
+	public void setListMeal(ArrayList<Meal> listMeal) {
+		this.listMeal = listMeal;
+	}
+	
+	@Override
+	public String toString(){
+		return "\n***\n Order, name : "+nameOrder+", date : "+ date +"\n Dishs : "+ listDish + "\n Meals : " + listMeal;
+	}
+
+	public void setDate(Others.Date date) {
+		this.date = date;
+	}
+
+	@Override
+	public int compareTo(Order o) {
+		return 0;
+	}
+	
+}
diff --git a/src/Others/Adress.java b/src/Others/Adress.java
index a6667c9..c9eb2f1 100644
--- a/src/Others/Adress.java
+++ b/src/Others/Adress.java
@@ -1,5 +1,12 @@
 package Others;
 
+/**
+ * x,y representation of an adress
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class Adress {
 	
 	private double x;
diff --git a/src/Others/Date.java b/src/Others/Date.java
index f02845c..5812aee 100644
--- a/src/Others/Date.java
+++ b/src/Others/Date.java
@@ -1,5 +1,12 @@
 package Others;
 
+/**
+ * Personal representation of an date.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 @SuppressWarnings("Changed by java.util.Date")
 public class Date {
 	
diff --git a/src/Others/IDCard.java b/src/Others/IDCard.java
index e3cf941..e2e7854 100644
--- a/src/Others/IDCard.java
+++ b/src/Others/IDCard.java
@@ -1,5 +1,13 @@
 package Others;
 
+/**
+ * Allow to create unique numbers, especially usefull when creating new
+ * fidelity cards.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class IDCard {
 	
 	
diff --git a/src/Others/Period.java b/src/Others/Period.java
index 1c9c357..73140f0 100644
--- a/src/Others/Period.java
+++ b/src/Others/Period.java
@@ -1,34 +1,36 @@
-package Others;
-
-import java.util.ArrayList;
-
-import Order.HistoricOrder;
-import Order.Order;
-
-public class Period {
-	private Date beginingOfPeriod, endOfPeriod;
-
-	public Period(Date beginingOfPeriod, Date endOfPeriod) {
-		super();
-		this.beginingOfPeriod = beginingOfPeriod;
-		this.endOfPeriod = endOfPeriod;
-	}
-
-	public Date getBeginingOfPeriod() {
-		return beginingOfPeriod;
-	}
-
-	public void setBeginingOfPeriod(Date beginingOfPeriod) {
-		this.beginingOfPeriod = beginingOfPeriod;
-	}
-
-	public Date getEndOfPeriod() {
-		return endOfPeriod;
-	}
-
-	public void setEndOfPeriod(Date endOfPeriod) {
-		this.endOfPeriod = endOfPeriod;
-	}
-
-
-}
+package Others;
+
+/**
+ * period between two date representation
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class Period {
+	private Date beginingOfPeriod, endOfPeriod;
+
+	public Period(Date beginingOfPeriod, Date endOfPeriod) {
+		super();
+		this.beginingOfPeriod = beginingOfPeriod;
+		this.endOfPeriod = endOfPeriod;
+	}
+
+	public Date getBeginingOfPeriod() {
+		return beginingOfPeriod;
+	}
+
+	public void setBeginingOfPeriod(Date beginingOfPeriod) {
+		this.beginingOfPeriod = beginingOfPeriod;
+	}
+
+	public Date getEndOfPeriod() {
+		return endOfPeriod;
+	}
+
+	public void setEndOfPeriod(Date endOfPeriod) {
+		this.endOfPeriod = endOfPeriod;
+	}
+
+
+}
diff --git a/src/StrategyProfit/ContextTargetProfitStrategy.java b/src/StrategyProfit/ContextTargetProfitStrategy.java
index 313b908..480cced 100644
--- a/src/StrategyProfit/ContextTargetProfitStrategy.java
+++ b/src/StrategyProfit/ContextTargetProfitStrategy.java
@@ -1,53 +1,63 @@
-package StrategyProfit;
-
-import Core.ContextStrategy;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownStartegyType;
-
-public class ContextTargetProfitStrategy implements ContextStrategy {
-	
-	public StrategyTargetProfitPolicy strategy;
-
-	public ContextTargetProfitStrategy(String strategyName) throws ExceptionUnknownStartegyType {
-		setStrategy(strategyName);
-	}
-	
-	public void setStrategy(String strategyName) throws ExceptionUnknownStartegyType{
-		strategyName = strategyName.toLowerCase().trim();
-		switch(strategyName){
-		case "deliverycost":
-			strategy = new TargetProfitDeliveryCost();
-			break;
-		case "servicefee":
-			strategy = new TargetProfitServiceFee();
-			break;
-		case "markup":
-			strategy = new TargetProfitMarkup();
-			break;
-		default:
-			throw new ExceptionUnknownStartegyType("Unknown startegy '"+strategyName+"', DeliveryCost, ServiceFee and Markup available.");
-		}
-	}
-	
-	public void execute(MyFoodora myFoodora, double targetProfit){
-		strategy.chooseTargetProfit(myFoodora, targetProfit);
-	}
-
-	@Override
-	public String toString() {
-		return strategy.toString();
-	}
-
-	public StrategyTargetProfitPolicy getStrategy() {
-		return strategy;
-	}
-
-	public void setStrategy(StrategyTargetProfitPolicy strategy) {
-		this.strategy = strategy;
-	}
-	
-	
-	
-	
-
-}
+package StrategyProfit;
+
+import Core.ContextStrategy;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+
+/**
+ * Context of the profit strategy. Allow the strategy to be saved and executed.
+ * In fact, strategies are used to modify variable of foodora used to calculated
+ * the order price.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class ContextTargetProfitStrategy implements ContextStrategy {
+	
+	public StrategyTargetProfitPolicy strategy;
+
+	public ContextTargetProfitStrategy(String strategyName) throws ExceptionUnknownStartegyType {
+		setStrategy(strategyName);
+	}
+	
+	@Override
+	public void setStrategy(String strategyName) throws ExceptionUnknownStartegyType{
+		strategyName = strategyName.toLowerCase().trim();
+		switch(strategyName){
+		case "deliverycost":
+			strategy = new TargetProfitDeliveryCost();
+			break;
+		case "servicefee":
+			strategy = new TargetProfitServiceFee();
+			break;
+		case "markup":
+			strategy = new TargetProfitMarkup();
+			break;
+		default:
+			throw new ExceptionUnknownStartegyType("Unknown startegy '"+strategyName+"', DeliveryCost, ServiceFee and Markup available.");
+		}
+	}
+	
+	public void execute(MyFoodora myFoodora, double targetProfit){
+		strategy.chooseTargetProfit(myFoodora, targetProfit);
+	}
+
+	@Override
+	public String toString() {
+		return strategy.toString();
+	}
+
+	public StrategyTargetProfitPolicy getStrategy() {
+		return strategy;
+	}
+
+	public void setStrategy(StrategyTargetProfitPolicy strategy) {
+		this.strategy = strategy;
+	}
+	
+	
+	
+	
+
+}
diff --git a/src/StrategyProfit/StrategyTargetProfitPolicy.java b/src/StrategyProfit/StrategyTargetProfitPolicy.java
index 0bb6ec0..f541811 100644
--- a/src/StrategyProfit/StrategyTargetProfitPolicy.java
+++ b/src/StrategyProfit/StrategyTargetProfitPolicy.java
@@ -1,22 +1,29 @@
-package StrategyProfit;
-
-import Core.MyFoodora;
-
-public abstract class StrategyTargetProfitPolicy {
-	protected String nameOfStrategy;
-	public abstract void chooseTargetProfit(MyFoodora myFoodora, double targetProfit);
-	
-	public String getNameOfStrategy() {
-		return nameOfStrategy;
-	}
-	protected void setNameOfStrategy(String nameOfStrategy) {
-		this.nameOfStrategy = nameOfStrategy;
-	}
-
-	@Override
-	public String toString() {
-		return nameOfStrategy;
-	}
-	
-	
-}
+package StrategyProfit;
+
+import Core.MyFoodora;
+
+/**
+ * Abstraction of the target profit strategy
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public abstract class StrategyTargetProfitPolicy {
+	protected String nameOfStrategy;
+	public abstract void chooseTargetProfit(MyFoodora myFoodora, double targetProfit);
+	
+	public String getNameOfStrategy() {
+		return nameOfStrategy;
+	}
+	protected void setNameOfStrategy(String nameOfStrategy) {
+		this.nameOfStrategy = nameOfStrategy;
+	}
+
+	@Override
+	public String toString() {
+		return nameOfStrategy;
+	}
+	
+	
+}
diff --git a/src/StrategyProfit/TargetProfitDeliveryCost.java b/src/StrategyProfit/TargetProfitDeliveryCost.java
index 5fe6345..4363577 100644
--- a/src/StrategyProfit/TargetProfitDeliveryCost.java
+++ b/src/StrategyProfit/TargetProfitDeliveryCost.java
@@ -1,26 +1,33 @@
-package StrategyProfit;
-
-import Core.MyFoodora;
-
-public class TargetProfitDeliveryCost extends StrategyTargetProfitPolicy {
-
-	public TargetProfitDeliveryCost(){
-		this.setNameOfStrategy("DeliveryCost");
-	}
-	
-	@Override
-	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
-		// TODO Auto-generated method stub
-		double lastMonthIncome = myFoodora.getLastMonthIncome();
-		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
-		if(numberOfOrder !=0){
-			double newDeliveryCost = myFoodora.getServiceFee() + (lastMonthIncome*myFoodora.getMarkupPercentage()-targetProfit)/numberOfOrder;
-			if(newDeliveryCost > 0){
-					myFoodora.setDeliveryCost(newDeliveryCost);
-			}else{
-				System.out.println("Warning, new deliveryCost is negative, aborted. " + newDeliveryCost);
-			}
-		}
-	}
-
-}
+package StrategyProfit;
+
+import Core.MyFoodora;
+
+/**
+ * Strategy which focus on the delivery cost.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class TargetProfitDeliveryCost extends StrategyTargetProfitPolicy {
+
+	public TargetProfitDeliveryCost(){
+		this.setNameOfStrategy("DeliveryCost");
+	}
+	
+	@Override
+	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
+		// TODO Auto-generated method stub
+		double lastMonthIncome = myFoodora.getLastMonthIncome();
+		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
+		if(numberOfOrder !=0){
+			double newDeliveryCost = myFoodora.getServiceFee() + (lastMonthIncome*myFoodora.getMarkupPercentage()-targetProfit)/numberOfOrder;
+			if(newDeliveryCost > 0){
+					myFoodora.setDeliveryCost(newDeliveryCost);
+			}else{
+				System.out.println("Warning, new deliveryCost is negative, aborted. " + newDeliveryCost);
+			}
+		}
+	}
+
+}
diff --git a/src/StrategyProfit/TargetProfitMarkup.java b/src/StrategyProfit/TargetProfitMarkup.java
index d56852a..337bd94 100644
--- a/src/StrategyProfit/TargetProfitMarkup.java
+++ b/src/StrategyProfit/TargetProfitMarkup.java
@@ -1,26 +1,33 @@
-package StrategyProfit;
-
-import Core.MyFoodora;
-
-public class TargetProfitMarkup extends StrategyTargetProfitPolicy {
-	
-	public TargetProfitMarkup(){
-		this.setNameOfStrategy("Markup");
-	}
-
-	@Override
-	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
-		// TODO Auto-generated method stub
-		double lastMonthIncome = myFoodora.getLastMonthIncome();
-		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
-		if(lastMonthIncome !=0){
-			double newMarkupPercentage = (targetProfit-myFoodora.getServiceFee()*numberOfOrder+myFoodora.getDeliveryCost()*numberOfOrder)/lastMonthIncome;
-			if(newMarkupPercentage >0){
-				myFoodora.setMarkupPercentage(newMarkupPercentage);
-			}else{
-				System.out.println("Warning, new markupPercentage is negative, aborted. " + newMarkupPercentage);
-			}
-		}
-	}
-
-}
+package StrategyProfit;
+
+import Core.MyFoodora;
+
+/**
+ * Strategy which focus on the markup.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class TargetProfitMarkup extends StrategyTargetProfitPolicy {
+	
+	public TargetProfitMarkup(){
+		this.setNameOfStrategy("Markup");
+	}
+
+	@Override
+	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
+		// TODO Auto-generated method stub
+		double lastMonthIncome = myFoodora.getLastMonthIncome();
+		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
+		if(lastMonthIncome !=0){
+			double newMarkupPercentage = (targetProfit-myFoodora.getServiceFee()*numberOfOrder+myFoodora.getDeliveryCost()*numberOfOrder)/lastMonthIncome;
+			if(newMarkupPercentage >0){
+				myFoodora.setMarkupPercentage(newMarkupPercentage);
+			}else{
+				System.out.println("Warning, new markupPercentage is negative, aborted. " + newMarkupPercentage);
+			}
+		}
+	}
+
+}
diff --git a/src/StrategyProfit/TargetProfitServiceFee.java b/src/StrategyProfit/TargetProfitServiceFee.java
index f550fe6..361833c 100644
--- a/src/StrategyProfit/TargetProfitServiceFee.java
+++ b/src/StrategyProfit/TargetProfitServiceFee.java
@@ -1,29 +1,36 @@
-package StrategyProfit;
-
-import Core.MyFoodora;
-
-public class TargetProfitServiceFee extends StrategyTargetProfitPolicy {
-	
-	public TargetProfitServiceFee(){
-		this.setNameOfStrategy("ServiceFee");
-	}
-
-	@Override
-	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
-		// TODO Auto-generated method stub
-		double lastMonthIncome = myFoodora.getLastMonthIncome();
-		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
-		if(numberOfOrder !=0){
-			double newServiceFee = (targetProfit-lastMonthIncome*myFoodora.getMarkupPercentage())/numberOfOrder + myFoodora.getDeliveryCost();
-			if(newServiceFee >0){
-				myFoodora.setServiceFee(newServiceFee);
-			}else{
-				System.out.println("Warning, new serviceFee is negative, aborted. " + newServiceFee);
-			}
-		}else{
-			System.out.println("Warning, no orders last month, new strategy can't be calculated");
-		}
-		
-	}
-
-}
+package StrategyProfit;
+
+import Core.MyFoodora;
+
+/**
+ * Strategy focused on the service fee
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
+public class TargetProfitServiceFee extends StrategyTargetProfitPolicy {
+	
+	public TargetProfitServiceFee(){
+		this.setNameOfStrategy("ServiceFee");
+	}
+
+	@Override
+	public void chooseTargetProfit(MyFoodora myFoodora, double targetProfit) {
+		// TODO Auto-generated method stub
+		double lastMonthIncome = myFoodora.getLastMonthIncome();
+		int numberOfOrder = myFoodora.getNumberOfOrderLastMonth();
+		if(numberOfOrder !=0){
+			double newServiceFee = (targetProfit-lastMonthIncome*myFoodora.getMarkupPercentage())/numberOfOrder + myFoodora.getDeliveryCost();
+			if(newServiceFee >0){
+				myFoodora.setServiceFee(newServiceFee);
+			}else{
+				System.out.println("Warning, new serviceFee is negative, aborted. " + newServiceFee);
+			}
+		}else{
+			System.out.println("Warning, no orders last month, new strategy can't be calculated");
+		}
+		
+	}
+
+}
diff --git a/src/User/Courier.java b/src/User/Courier.java
index ab36214..02d0c86 100644
--- a/src/User/Courier.java
+++ b/src/User/Courier.java
@@ -1,27 +1,18 @@
 package User;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Scanner;
-
-import Cli.Input;
 import Core.MyFoodora;
-import Order.HistoricOrder;
 import Order.Order;
 import Others.Adress;
 import Others.Position;
 
-/**  
+/**
+ * The Courier deliver the order from the restaurant to the customer.
+ * It may accept or decline the deliver.
  * 
- * @author asus
- *
- *test Javadoc
+ * @author Nicolas FLEY et Corentin RAVOUX
  *
- *
- *OK
  */
 
-
 public class Courier extends HumanUser{
 
 	
@@ -152,10 +143,12 @@ public class Courier extends HumanUser{
 		System.out.println("The courier " + this.name + " has refused the delivery");
 	}
 	
+	@Override
 	public String toString(){
 		return "Courier : "+name+", position : "+adress+", number of orders done : "+nbOfLivraison+", available : "+available;
 	}
 	
+	@Override
 	public int compareTo(User courier){
 		if(courier instanceof Courier){
 			Courier c = (Courier) courier;
diff --git a/src/User/Customer.java b/src/User/Customer.java
index e740b15..c3c3020 100644
--- a/src/User/Customer.java
+++ b/src/User/Customer.java
@@ -1,28 +1,27 @@
 package User;
 
 import java.util.ArrayList;
-import java.util.Scanner;
-import Cli.Confirm;
-
 import Cards.BasicFidelityCard;
 import Cards.FidelityCard;
 import Cards.LotteryFidelityCard;
 import Cards.PointFidelityCard;
-import Cards.VisitableCard;
 import Cards.VisiterCard;
 import Others.Adress;
 import Others.IDCard;
 import Order.HistoricOrder;
 import Order.Order;
-import Cli.Input;
 import Core.MyFoodora;
 import Item.Dish;
-import Item.FactoryDish;
-import Item.Item;
 import Item.Meal;
-import Item.MealFactory;
 import Offers.Observer;
 
+/**
+ * Customer may create order, add meals and dishes to it from a restaurant and ask to be delivered.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class Customer extends HumanUser implements VisiterCard,Observer {
 	
 	public static final int UNKNOWN = 0;
diff --git a/src/User/FactoryUserFactory.java b/src/User/FactoryUserFactory.java
deleted file mode 100644
index 1600004..0000000
--- a/src/User/FactoryUserFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package User;
-
-public class FactoryUserFactory {
-	
-	public UserFactory createUserFactory(String typeOfUserFactory){
-		if(typeOfUserFactory == "Human"){
-			HumanUserFactory humanUF = new HumanUserFactory();
-			return humanUF ;
-		}
-		else if (typeOfUserFactory == "Moral"){
-			MoralUserFactory moralUF = new MoralUserFactory();
-			return moralUF ;
-		}
-		else {
-			System.out.println("Please choose your type of User to create between Human and Moral");
-			return null;
-		}
-		
-	}
-
-}
diff --git a/src/User/HumanUser.java b/src/User/HumanUser.java
index 3a887dc..1504d59 100644
--- a/src/User/HumanUser.java
+++ b/src/User/HumanUser.java
@@ -2,6 +2,13 @@ package User;
 
 import Others.Adress;
 
+/**
+ * Abstraction of human users.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class HumanUser extends User {
 	
 	private String birthdayDate, surname;
diff --git a/src/User/HumanUserFactory.java b/src/User/HumanUserFactory.java
deleted file mode 100644
index 91ed5eb..0000000
--- a/src/User/HumanUserFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package User;
-
-import Others.Adress;
-
-public class HumanUserFactory extends UserFactory {
-	
-	@Override
-	public void createUser(long phoneNumber, String name, String username, String mail, String password,
-			Adress adress, boolean activated) {
-		try{
-		User newUser = new Restaurant(phoneNumber,name,username,mail,password,adress,activated);
-		}
-		catch (Exception e) {} // faire le try/catch � l'ajout d'un User pour �viter les doublons.
-		
-	}
-
-}
diff --git a/src/User/IDUser.java b/src/User/IDUser.java
index 45fce25..ac0fc2e 100644
--- a/src/User/IDUser.java
+++ b/src/User/IDUser.java
@@ -1,6 +1,11 @@
 package User;
 
-
+/**
+ * Attache an unique Id to the user.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
 
 public class IDUser {
 
diff --git a/src/User/ListUser.java b/src/User/ListUser.java
index e5c52d4..ed13861 100644
--- a/src/User/ListUser.java
+++ b/src/User/ListUser.java
@@ -1,50 +1,58 @@
-package User;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class ListUser<T extends User> implements Iterable<Object>{
-	private ArrayList<T> listUser = new ArrayList<T>();
-	
-	/** CUSTOM **/
-
-	public User getUserByLogin(String username, String password){
-		for(User u : listUser){
-			if(u.isLoginCorrect(username,password))
-				return u;
-		}
-		return null;
-	}
-	public void addUser(T e){
-		listUser.add(e);
-	}
-	public void removeUser(T e){
-		listUser.remove(e);
-	}
-	
-	public void setUseractivated(boolean activate, T e){
-		this.removeUser(e);
-		e.setActivated(activate);
-		this.addUser(e);
-	}
-	
-	/** GETTER & SETTER **/
-	
-	public ArrayList<T> getList(){
-		return listUser;
-	}
-	@Override
-	public String toString(){
-		String str = "";
-		for(User u : listUser){
-			str += u.toString() + "\n";
-		}
-		return str;
-	}
-	@Override
-	public Iterator<Object> iterator() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
+package User;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * Gives methods and form to use and manage list of users.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ * @param <T>
+ */
+
+public class ListUser<T extends User> implements Iterable<Object>{
+	private ArrayList<T> listUser = new ArrayList<T>();
+	
+	/** CUSTOM **/
+
+	public User getUserByLogin(String username, String password){
+		for(User u : listUser){
+			if(u.isLoginCorrect(username,password))
+				return u;
+		}
+		return null;
+	}
+	public void addUser(T e){
+		listUser.add(e);
+	}
+	public void removeUser(T e){
+		listUser.remove(e);
+	}
+	
+	public void setUseractivated(boolean activate, T e){
+		this.removeUser(e);
+		e.setActivated(activate);
+		this.addUser(e);
+	}
+	
+	/** GETTER & SETTER **/
+	
+	public ArrayList<T> getList(){
+		return listUser;
+	}
+	@Override
+	public String toString(){
+		String str = "";
+		for(User u : listUser){
+			str += u.toString() + "\n";
+		}
+		return str;
+	}
+	@Override
+	public Iterator<Object> iterator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
 	
\ No newline at end of file
diff --git a/src/User/Manager.java b/src/User/Manager.java
index 55e1ad1..b4d6dfb 100644
--- a/src/User/Manager.java
+++ b/src/User/Manager.java
@@ -1,19 +1,13 @@
 package User;
 import Core.MyFoodora;
 import DeliveryStrategy.ContextDeliveryStrategy;
-import Exception.ExceptionUnknownMealType;
 import Exception.ExceptionUnknownTypeOfUser;
 import Item.Dish;
 import Item.HalfMeal;
 import Order.HistoricOrder;
 import Order.Order;
 
-import java.time.Period;
 import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.swing.text.Caret;
-
 import Cards.FidelityCard;
 import Cards.LotteryFidelityCard;
 import Others.Adress;
@@ -21,6 +15,14 @@ import StrategyProfit.ContextTargetProfitStrategy;
 import UserFactoryPattern.FactoryUserFactory;
 import UserFactoryPattern.UserFactory;
 
+/**
+ * The managers controls foodora, they are able to do anything in the system
+ * Creating users, changing parameters, calculating statistics.
+ * This class contain a lot of methods describing theses abilities.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
 
 public class Manager extends HumanUser {
 	
diff --git a/src/User/MoralUser.java b/src/User/MoralUser.java
index 4053d4c..f759d0c 100644
--- a/src/User/MoralUser.java
+++ b/src/User/MoralUser.java
@@ -1,9 +1,14 @@
 package User;
 
-import java.math.BigInteger;
-
 import Others.Adress;
 
+/**
+ * Abstraction of non human users.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class MoralUser extends User {
 
 	public MoralUser(long phoneNumber, String name, String username, String mail, String password,
diff --git a/src/User/MoralUserFactory.java b/src/User/MoralUserFactory.java
deleted file mode 100644
index 0c4dbb5..0000000
--- a/src/User/MoralUserFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package User;
-
-import Others.Adress;
-
-public class MoralUserFactory extends UserFactory {
-
-	@Override
-	public void createUser(long phoneNumber, String name, String username, String mail, String password,
-			Adress adress, boolean activated) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/src/User/Restaurant.java b/src/User/Restaurant.java
index c703064..243398f 100644
--- a/src/User/Restaurant.java
+++ b/src/User/Restaurant.java
@@ -1,6 +1,5 @@
 package User;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 import Core.MyFoodora;
@@ -15,10 +14,16 @@ import Item.Meal;
 import Offers.MealOfTheWeek;
 import Others.Adress;
 
+/**
+ * Restaurant are able to manage themself, they may create there meals, dishes,
+ * set the mealOfTheWeek or specify discount factor.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class Restaurant extends MoralUser {
 	
-	
-	
 	private ArrayList<Meal> listOfMeal;
 	private ArrayList<Dish> listOfDish;
 	private double generalDiscountFactor;
@@ -33,7 +38,7 @@ public class Restaurant extends MoralUser {
 		this.listOfMeal = new ArrayList<Meal>();
 		this.listOfDish = new ArrayList<Dish>();
 		this.mealOfTheWeek = new MealOfTheWeek(null);
-		this.typeOfUser = RESTAURANT;
+		this.typeOfUser = User.RESTAURANT;
 		this.generalDiscountFactor = 0.05;
 		this.specialDiscountFactor = 0.1;
 	}
diff --git a/src/User/User.java b/src/User/User.java
index 87b4743..b3adbf4 100644
--- a/src/User/User.java
+++ b/src/User/User.java
@@ -3,6 +3,14 @@ package User;
 import Others.Adress;
 import Order.HistoricOrder;
 
+/**
+ * Abstraction of all the available users.
+ * Each available user have a list of itself stocked in foodora.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public abstract class User implements Comparable<User> {
 	
 	protected long id;
diff --git a/src/User/UserFactory.java b/src/User/UserFactory.java
index 262ef3b..82af0bb 100644
--- a/src/User/UserFactory.java
+++ b/src/User/UserFactory.java
@@ -1,12 +1,6 @@
 package User;
 
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-
-import javax.management.RuntimeErrorException;
-
 import Others.Adress;
 
 public abstract class UserFactory {
diff --git a/src/UserFactoryPattern/FactoryUserFactory.java b/src/UserFactoryPattern/FactoryUserFactory.java
index b9c63a9..dd8a7bf 100644
--- a/src/UserFactoryPattern/FactoryUserFactory.java
+++ b/src/UserFactoryPattern/FactoryUserFactory.java
@@ -1,8 +1,14 @@
 package UserFactoryPattern;
 
-import Exception.ExceptionUnknownMealType;
 import Exception.ExceptionUnknownTypeOfUser;
 
+/**
+ * Context to use user factories.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public abstract class FactoryUserFactory {
 	
 	public static UserFactory createUserFactory(String typeOfUserFactory) throws ExceptionUnknownTypeOfUser {
diff --git a/src/UserFactoryPattern/HumanUserFactory.java b/src/UserFactoryPattern/HumanUserFactory.java
index 082cdb0..2c6d4ea 100644
--- a/src/UserFactoryPattern/HumanUserFactory.java
+++ b/src/UserFactoryPattern/HumanUserFactory.java
@@ -1,7 +1,5 @@
 package UserFactoryPattern;
 
-import Cli.Confirm;
-import Cli.Input;
 import Exception.ExceptionUnknownTypeOfUser;
 import Others.Adress;
 import User.Courier;
@@ -10,6 +8,13 @@ import User.HumanUser;
 import User.Manager;
 import User.MoralUser;
 
+/**
+ * Allow to create human users.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class HumanUserFactory extends UserFactory{
 	
 	
diff --git a/src/UserFactoryPattern/MoralUserFactory.java b/src/UserFactoryPattern/MoralUserFactory.java
index e8db80b..7b12f68 100644
--- a/src/UserFactoryPattern/MoralUserFactory.java
+++ b/src/UserFactoryPattern/MoralUserFactory.java
@@ -2,11 +2,17 @@ package UserFactoryPattern;
 
 import Exception.ExceptionUnknownTypeOfUser;
 import Others.Adress;
-import User.Courier;
 import User.HumanUser;
 import User.MoralUser;
 import User.Restaurant;
 
+/**
+ * Allow to create generic non human users.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public class MoralUserFactory extends UserFactory {
 
 	@Override
diff --git a/src/UserFactoryPattern/UserFactory.java b/src/UserFactoryPattern/UserFactory.java
index 452223d..c939cb9 100644
--- a/src/UserFactoryPattern/UserFactory.java
+++ b/src/UserFactoryPattern/UserFactory.java
@@ -1,17 +1,18 @@
 package UserFactoryPattern;
 
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-
-import javax.management.RuntimeErrorException;
-
 import Exception.ExceptionUnknownTypeOfUser;
 import Others.Adress;
 import User.HumanUser;
 import User.MoralUser;
 
+/**
+ * Factory to create factory of abstracted user.
+ * 
+ * @author Nicolas FLEY et Corentin RAVOUX
+ *
+ */
+
 public abstract class UserFactory {
 	
 	public static final int UNKNOWN = 0;
diff --git a/src/model.di b/src/model.di
index bf9abab..8634d4c 100644
--- a/src/model.di
+++ b/src/model.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/src/model.notation b/src/model.notation
index cf3b4a4..134430a 100644
--- a/src/model.notation
+++ b/src/model.notation
@@ -1,2276 +1,2276 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AN9ZEBVKEeeMzp7YIeMZtw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_td6vkBVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkhVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkxVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_td6vlBVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vlRVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vlhVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vlxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vmBVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vmRVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vmhVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vmxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vnBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vnRVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vnhVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vnxVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_td6voBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_td6voRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vohVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6voxVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_tdw-kBVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vkRVLEeeMzp7YIeMZtw" x="2399" y="1088"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_3Heq0RVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq0xVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq1BVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Heq1RVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq1hVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq1xVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq2BVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq2RVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq2hVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq2xVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq3BVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq3RVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq3hVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq3xVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq4BVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq4RVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq4hVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq4xVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq5BVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_3Heq0BVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq0hVLEeeMzp7YIeMZtw" x="2519" y="1090"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_7yg2kRVLEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2kxVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2lBVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7yg2lRVLEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2lhVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2lxVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2mBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2mRVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2mhVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2mxVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2nBVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2nRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2nhVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2nxVLEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2oBVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2oRVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2ohVLEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2oxVLEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2pBVLEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_7yg2kBVLEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2khVLEeeMzp7YIeMZtw" x="2651" y="1080"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_0EXCoBVMEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCohVMEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCoxVMEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0EXCpBVMEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCpRVMEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_-U5eUBVMEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_-UmjYBVMEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-U5eURVMEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_FrX8oBVNEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_FrEaoBVNEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FrX8oRVNEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_OA0n0BVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_OAX74BVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OA0n0RVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCphVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCpxVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCqBVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCqRVMEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCqhVMEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCqxVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCrBVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCrRVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCrhVMEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCrxVMEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCsBVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCsRVMEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCshVMEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCsxVMEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_0EEHsBVMEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCoRVMEeeMzp7YIeMZtw" x="2503" y="934"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_4sOJIRVNEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJIxVNEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJJBVNEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4sOJJRVNEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJJhVNEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJJxVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJKBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJKRVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJKhVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJKxVNEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_5RXoIBVOEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_5QxLMBVOEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5RXoIRVOEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJLBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJLRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJLhVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJLxVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJMBVNEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJMRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJMhVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJMxVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJNBVNEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_4sOJIBVNEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJIhVNEeeMzp7YIeMZtw" x="2638" y="739" width="227"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_9zOfMRVNEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfMxVNEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfNBVNEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9zOfNRVNEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfNhVNEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfNxVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfOBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfORVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfOhVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfOxVNEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfPBVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfPRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfPhVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfPxVNEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfQBVNEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfQRVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfQhVNEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfQxVNEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfRBVNEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_9zOfMBVNEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfMhVNEeeMzp7YIeMZtw" x="2176" y="799" height="62"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWr8xVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9BVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9RVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr9hVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr9xVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr-BVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWr-RVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWr-hVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWr-xVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr_BVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QsWr_RVPEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QsWr8RVPEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr_hVPEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr_xVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsABVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsARVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsAhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsAxVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsBBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsBRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsBhVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsBxVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr7xVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsCxVPEeeMzp7YIeMZtw" x="1418" y="929" width="227"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWsSBVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsSRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsShVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsSxVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsTBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsTRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsThVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsTxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsUBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsURVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsUhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsUxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsVBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsVRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsVhVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsVxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsWBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsWRVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsWhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr4xVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsXhVPEeeMzp7YIeMZtw" x="1983" y="1091"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWsXxVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYBVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYRVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsYhVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsYxVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsZBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsZRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsZhVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsZxVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsaBVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsaRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsahVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsaxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsbBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsbRVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsbhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsbxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWscBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWscRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr4RVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsdRVPEeeMzp7YIeMZtw" x="1732" y="1088"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QsWslBVPEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslhVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWslxVPEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsmBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QsWsmRVPEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QsWr7RVPEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsmhVPEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_SCRggBVQEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_SBh5oBVQEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SCRggRVQEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_bQ1FUBVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_bQOoYBVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bQ1FURVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsnRVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsnhVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsnxVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsoBVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsoRVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_uK47kBVREeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_uKTFsBVREeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uK47kRVREeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsohVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsoxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWspBVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWspRVPEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsphVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWspxVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsqBVPEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsqRVPEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsqhVPEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QsWr7BVPEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsrhVPEeeMzp7YIeMZtw" x="1826" y="930"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_D3T2oBVQEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2ohVQEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2oxVQEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_D3T2pBVQEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2pRVQEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2phVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2pxVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2qBVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2qRVQEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2qhVQEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2qxVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2rBVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2rRVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2rhVQEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2rxVQEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2sBVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2sRVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2shVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2sxVQEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2oRVQEeeMzp7YIeMZtw" x="1783" y="835" height="29"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_-j608RVQEeeMzp7YIeMZtw" type="Enumeration_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_-j608xVQEeeMzp7YIeMZtw" type="Enumeration_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_-j609BVQEeeMzp7YIeMZtw" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-j609RVQEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_-j609hVQEeeMzp7YIeMZtw" type="Enumeration_LiteralCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_-j609xVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_-j60-BVQEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-j60-RVQEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j60-hVQEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="model.uml#_-j608BVQEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j608hVQEeeMzp7YIeMZtw" x="2184" y="965" height="58"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_31XnYRVSEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_31XnYxVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_31XnZBVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_31XnZRVSEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnZhVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnZxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnaBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnaRVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnahVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnaxVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnbBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnbRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnbhVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnbxVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_31XncBVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_31XncRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnchVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XncxVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XndBVSEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_31XnYBVSEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnYhVSEeeMzp7YIeMZtw" x="2177" y="744" height="52"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_6giNIBVSEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIhVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIxVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6giNJBVSEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNJRVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U78U8BVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U78U8RVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNJhVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNJxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNKBVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNKRVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNKhVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VJeaoBVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VJeaoRVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_ETBa4BVTEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_ESR0ABVTEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ETBa4RVTEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNKxVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNLBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNLRVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNLhVSEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNLxVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNMBVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNMRVSEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNMhVSEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNMxVSEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_6gYcIBVSEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNIRVSEeeMzp7YIeMZtw" x="2175" y="864" width="100" height="67"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_qOaNARVTEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_qOaNAxVTEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_qOjW8BVTEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qOjW8RVTEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW8hVTEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_hxRLIBVfEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hwhkQBVfEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxRLIRVfEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_xW6N0BVgEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_xVpCgBVgEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xW6N0RVgEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW8xVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW9BVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW9RVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW9hVTEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW9xVTEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW-BVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW-RVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW-hVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW-xVTEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW_BVTEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW_RVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW_hVTEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW_xVTEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjXABVTEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_qOaNABVTEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOaNAhVTEeeMzp7YIeMZtw" x="2185" y="1100"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3hKMBVhEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYUBVhEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYURVhEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_o3iYUhVhEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYUxVhEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYVBVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYVRVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYVhVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYVxVhEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYWBVhEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_xEQiIBVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_xDYYYBVhEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xEQiIRVhEeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_6AI4ABVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_5_YDABVhEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6AI4ARVhEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYWRVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYWhVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYWxVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYXBVhEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYXRVhEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYXhVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYXxVhEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYYBVhEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYYRVhEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_o3bDkBVhEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hKMRVhEeeMzp7YIeMZtw" x="2159" y="652" height="87"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_T_A7MBVqEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MhVqEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MxVqEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_T_A7NBVqEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7NRVqEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7NhVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7NxVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7OBVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7ORVqEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7OhVqEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_aBtdcBVqEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_aBVC8BVqEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aBtdcRVqEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7OxVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7PBVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7PRVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7PhVqEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7PxVqEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7QBVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7QRVqEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7QhVqEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7QxVqEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_T-934BVqEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7MRVqEeeMzp7YIeMZtw" x="2306" y="1253"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_wWO9gBVsEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9ghVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9gxVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wWO9hBVsEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9hRVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9hhVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9hxVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9iBVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9iRVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9ihVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_zWxWUBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_zWDkoBVsEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zWxWURVsEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9ixVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9jBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9jRVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9jhVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9jxVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9kBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9kRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9khVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9kxVsEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_wWBiIBVsEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9gRVsEeeMzp7YIeMZtw" x="2216" y="1415"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_15nGgRVsEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_15nGgxVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_15nGhBVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_15nGhRVsEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGhhVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGhxVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGiBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGiRVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGihVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGixVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_6hM8sBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_6gpjEBVsEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6hM8sRVsEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGjBVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGjRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGjhVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGjxVsEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGkBVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGkRVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGkhVsEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGkxVsEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGlBVsEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_15nGgBVsEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGghVsEeeMzp7YIeMZtw" x="2371" y="1415"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_TQvYkBVtEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkhVtEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkxVtEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TQvYlBVtEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQvYlRVtEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_Fmv4UBVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_Fl5jwBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fmv4URVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQvYlhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQvYlxVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQvYmBVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYmRVtEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNwBVtEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_BYH7wBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_BXlJMBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BYH7wRVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNwRVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNwhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNwxVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNxBVtEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNxRVtEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNxhVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNxxVtEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNyBVtEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNyRVtEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_TQsVQBVtEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYkRVtEeeMzp7YIeMZtw" x="2611" y="1310"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trQ6MRVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MhVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MxVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6NBVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6NRVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6NhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6NxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6OBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6ORVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6OhVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trQ6OxVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQ6JRVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6PBVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6PRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6PhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6PxVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6QBVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6QRVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6QhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6QxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6RBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6RRVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQ6JBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6SRVuEeeMzp7YIeMZtw" x="2956" y="1271"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhOxVuEeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPBVuEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPRVuEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhPhVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhPxVuEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhQBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhQRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhQhVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhQxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhRBVuEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhRRVuEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTGBVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhRhVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhRxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhSBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhSRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhShVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhSxVuEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhTBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhTRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhThVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhTxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_trQTFxVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhUxVuEeeMzp7YIeMZtw" x="3046" y="1109"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhaxVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbBVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbRVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhbhVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhbxVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhcBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhcRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhchVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhcxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhdBVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhdRVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTFhVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhdhVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhdxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRheBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRheRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhehVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhexVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhfBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhfRVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhfhVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhfxVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQTFRVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhgxVuEeeMzp7YIeMZtw" x="3139" y="1275"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_trRhhBVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhRVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhhVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhhxVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhiBVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhiRVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_trQTERVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhihVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhixVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhjBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhjRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhjhVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhjxVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_trRhkBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_trQTExVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhkRVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhkhVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhkxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhlBVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhlRVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhlhVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhlxVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhmBVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhmRVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhmhVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_trQTEBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhnhVuEeeMzp7YIeMZtw" x="2838" y="959"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_7uQ60BVuEeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60RVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60hVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ60xVuEeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ61BVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ61RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ61hVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ61xVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ62BVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ62RVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_7uQ62hVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_7uPssRVuEeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ62xVuEeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ63BVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ63RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ63hVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ63xVuEeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ64BVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ64RVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ64hVuEeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ64xVuEeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ65BVuEeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_7uPssBVuEeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ66BVuEeeMzp7YIeMZtw" x="2841" y="1127"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_OgQLcBV1EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLchV1EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLcxV1EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OgQLdBV1EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgQLdRV1EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_SBongBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_SBA8cBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SBongRV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_VfZH0BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_Ve1uMBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VfZH0RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_agXHUBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_afrK0BV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_agXHURV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hKpOABV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hKSosBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hKpOARV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hka_8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hkFowBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hka_8RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_hlW0EBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_hk8kYBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hlW0ERV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_uwAQcBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_uvbosBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uwAQcRV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_1l2t8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_1lKKYBV1EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1l2t8RV1EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_ARw3ABV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_AQ-M0BV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ARw3ARV2EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_JGnX0BV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_JFxqUBV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGnX0RV2EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgQLdhV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgQLdxV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgQLeBV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLeRV1EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSAoBV1EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_avHfkBV2EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_auaU8BV2EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_avHfkRV2EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAoRV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSAohV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAoxV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSApBV1EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSApRV1EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAphV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSApxV1EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAqBV1EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSAqRV1EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_OgNIIBV1EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLcRV1EeeMzp7YIeMZtw" x="990" y="834"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxSq4xV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5BV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5RV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq5hV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq5xV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq6BV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq6RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq6hV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq6xV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq7BV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq7RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq7hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq7xV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq8BV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq8RV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq8hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq8xV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq9BV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq9RV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1sBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq-RV-EeeMzp7YIeMZtw" x="670" y="398" width="177" height="176"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxSq-hV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq-xV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq_BV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq_RV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq_hV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxSq_xV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1thV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrABV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxSrARV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1txV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrAhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrAxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrBBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrBRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrBhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrBxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrCBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrCRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrChV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrCxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrDBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrDRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrDhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrDxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrEBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1tRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrFBV-EeeMzp7YIeMZtw" x="1702" y="198"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTR8BV-EeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8RV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8hV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR8xV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR9BV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTR9RV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTR9hV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTR9xV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTR-BV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR-RV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTR-hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcxhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR-xV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxTR_BV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcxxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_RV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxTR_hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxRcyBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_xV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSABV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSARV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSAhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSAxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSBBV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSBRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSBhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSBxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSCBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_QxRcxRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSDBV-EeeMzp7YIeMZtw" x="557" y="1010" width="140" height="131"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSIRV-EeeMzp7YIeMZtw" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIhV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIxV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSJBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSJRV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSJhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSJxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSKBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSKRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSKhV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSKxV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxPnkhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSLBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSLRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSLhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSLxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSMBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSMRV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSMhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSMxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSNBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSNRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Interface" href="model.uml#_QxPnkBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSORV-EeeMzp7YIeMZtw" x="215" y="995" width="139" height="145"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSQxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSRhV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSRxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSSBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPnmRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSSRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSShV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSSxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSTBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSTRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSThV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSTxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSUBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSURV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSUhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSUxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSVBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSVRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSVhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSVxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPnmBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSWxV-EeeMzp7YIeMZtw" x="920" y="357"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxTSXBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSXxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSYBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxTSYRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOthV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSYhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSYxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSZBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSZRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSZhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSZxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSaBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSaRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSahV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSaxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSbBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSbRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSbhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSbxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTScBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSdBV-EeeMzp7YIeMZtw" x="1273" y="413" width="240" height="199"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5HhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5HxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5IBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5IRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5IhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5IxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5JRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5JxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD3xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5KBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5KRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5KhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5KxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5LBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5LRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5LhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5LxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5MBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5MhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5NBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD4xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5NhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD5BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5OBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD5RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ORV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5OhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5OxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5PBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5PRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5PhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5PxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5QBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5QRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5QhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD2xV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5RhV-EeeMzp7YIeMZtw" x="442" y="603" width="189" height="249"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5TxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5UBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5URV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5UhV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5UxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5VBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAhRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5VhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAhhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5WBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5WRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5WhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5WxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5XBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5XRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5XhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5XxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5YBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5YRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5YhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5YxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5ZBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5ZRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ZhV-EeeMzp7YIeMZtw" type="compartment_shape_display">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5ZxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aRV-EeeMzp7YIeMZtw" x="166" y="403" width="196" height="173"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5ahV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5axV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5bBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5bRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5bhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5bxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5cBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5cRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5chV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5cxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5dBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5dRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5dhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5dxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5eBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5eRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5ehV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5exV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5fBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOrxV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5gBV-EeeMzp7YIeMZtw" x="1115" y="676"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5gRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ghV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5gxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5hBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5hRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5hhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5hxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5iBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5iRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ihV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5ixV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSq4hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5jBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5jRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5jhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5jxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5kBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5kRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5khV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5kxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5lBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5lRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSq4BV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5mRV-EeeMzp7YIeMZtw" x="868" y="36" width="208" height="196"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxT5mhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5mxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5nBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5nRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5nhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxT5nxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOoRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5oBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxT5oRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOohV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ohV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5oxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5pBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5pRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5phV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5pxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5qBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5qRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5qhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5qxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5rBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5rRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5rhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5rxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5sBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOoBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5tBV-EeeMzp7YIeMZtw" x="1551" y="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgERV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgEhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgExV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgFBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgFRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgFhV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgFxV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgGBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAiRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgGhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAihV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgHBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAixV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgHhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgIBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgIhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAkBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgJBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgJhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAjxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgKBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgKRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgKhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgKxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgLBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgLRV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgLhV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
-      </eAnnotations>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgLxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxPAkRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgMBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgMRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgMhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgMxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgNBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgNRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgNhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgNxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgOBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgORV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAiBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgPRV-EeeMzp7YIeMZtw" x="378" y="15" width="204" height="303"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgRxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgShV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgSxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgTBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOshV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgThV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOsxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOtBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgURV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgUhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgUxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgVBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgVRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgVxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgWBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgWRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgWhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgXBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgXRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgXhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgXxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOsRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgYxV-EeeMzp7YIeMZtw" x="1344" y="200"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgZBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgZxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgaBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgaRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD1RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgahV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgaxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgbBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgbRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgbhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgbxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgcBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD1hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgchV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD1xV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgdBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2BV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgdhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgeBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxSD2hV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgeRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgehV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgexV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgfBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgfRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgfhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgfxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUggBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUggRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgghV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD0xV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUghhV-EeeMzp7YIeMZtw" x="691" y="683" width="161" height="167"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxUgnhV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgnxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgoBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgoRV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgohV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgoxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOpRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgpBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgpRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOphV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgphV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgpxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQOpxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgqBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgqRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgqhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgqxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgrBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgrRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxUgrhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgrxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgsBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgshV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgtBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOqxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUgthV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUguBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguRV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxUguhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQOrhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgvBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgvRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgvhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgvxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgwBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgwRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgwhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgwxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgxBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQOoxV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgyBV-EeeMzp7YIeMZtw" x="176" y="660" width="168" height="257"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHMRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHNRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHNhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxQ1tBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHOBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHORV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHOhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHOxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHPBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHPRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHPhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHPxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHQBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHQRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHQhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHQxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHRBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHRRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1shV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHSRV-EeeMzp7YIeMZtw" x="1598" y="675"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHYRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHZBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHZRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHZhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHZxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHaBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHaRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHahV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHaxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1uhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHbRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHbxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHcBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHcRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHchV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHcxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHdRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHdxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1whV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHeBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHeRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHehV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHexV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHfRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHfxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xhV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHgBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHgRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHghV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHgxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yBV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHhRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHhxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHiBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHiRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHihV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHixV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHjBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHjRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHjhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHjxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxQ1uBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHkxV-EeeMzp7YIeMZtw" x="-69" y="660" width="177" height="412"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHlBV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHlxV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHmBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHmRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAgRV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHmhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHmxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAghV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnBV-EeeMzp7YIeMZtw"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_QxVHnRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPAgxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnhV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHnxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHoBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHoRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHohV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHoxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHpBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHpRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHphV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHpxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHqBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHqRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHqhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHqxV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHrBV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPAgBV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHsBV-EeeMzp7YIeMZtw" x="501" y="1216" width="151" height="141"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVHsRV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHshV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHsxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtBV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHtRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVHthV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxSD0RV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtxV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHuhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHuxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHvBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHvRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHvhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHvxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHwBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHwRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHwhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHwxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHxBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHxRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHxhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHxxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxSD0BV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHyxV-EeeMzp7YIeMZtw" x="689" y="1216" width="136" height="136"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QxVuSxV-EeeMzp7YIeMZtw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuThV-EeeMzp7YIeMZtw" y="5"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuTxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_QxVuUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="model.uml#_QxPnlxV-EeeMzp7YIeMZtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuURV-EeeMzp7YIeMZtw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuUhV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuUxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuVBV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuVRV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuVxV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuWBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuWRV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuWhV-EeeMzp7YIeMZtw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuXBV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuXRV-EeeMzp7YIeMZtw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuXhV-EeeMzp7YIeMZtw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuXxV-EeeMzp7YIeMZtw"/>
-    </children>
-    <element xmi:type="uml:Class" href="model.uml#_QxPnlRV-EeeMzp7YIeMZtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuYxV-EeeMzp7YIeMZtw" x="1309" y="673"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_AN9ZERVKEeeMzp7YIeMZtw" name="diagram_compatibility_version" stringValue="1.2.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_AN9ZEhVKEeeMzp7YIeMZtw"/>
-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AN9ZExVKEeeMzp7YIeMZtw">
-    <owner xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
-  </styles>
-  <element xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
-  <edges xmi:type="notation:Connector" xmi:id="_d3PDsBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_td6vkBVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_d3PDsxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfG6EBVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d3PDtBVNEeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_d3PDsRVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_d28IwBVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d3PDshVNEeeMzp7YIeMZtw" points="[1619, 526, -643984, -643984]$[1652, 462, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0BVNEeeMzp7YIeMZtw" id="(0.63,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0RVNEeeMzp7YIeMZtw" id="(0.0,0.7734375)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_g_M6MBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_3Heq0RVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_g_M6MxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfjmABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g_M6NBVNEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_g_M6MRVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_g-wOQBVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_M6MhVNEeeMzp7YIeMZtw" points="[1714, 531, -643984, -643984]$[1711, 487, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_EBVNEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_ERVNEeeMzp7YIeMZtw" id="(0.45925925925925926,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_iOWN4BVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_7yg2kRVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_iOWN4xVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qgc94BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_iOWN5BVNEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_iOWN4RVNEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_iN5h8BVNEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iOWN4hVNEeeMzp7YIeMZtw" points="[1832, 495, -643984, -643984]$[1787, 464, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50BVNEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50RVNEeeMzp7YIeMZtw" id="(1.0,0.7890625)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_AhSn8RVOEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4BVOEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qf2g8BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4RVOEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4hVOEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QgTM4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4xVOEeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_AhSn8hVOEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_AhSn8BVOEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AhSn8xVOEeeMzp7YIeMZtw" points="[1709, 375, -643984, -643984]$[1709, 347, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwBVOEeeMzp7YIeMZtw" id="(0.12574850299401197,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwRVOEeeMzp7YIeMZtw" id="(1.0,0.5967741935483871)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Gn1vcBVOEeeMzp7YIeMZtw" type="Association_Edge" source="_4sOJIRVNEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vcxVOEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3yl9ABVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdBVOEeeMzp7YIeMZtw" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdRVOEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zCo8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdhVOEeeMzp7YIeMZtw" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdxVOEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zMZ8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1veBVOEeeMzp7YIeMZtw" x="-5" y="21"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1veRVOEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zVj4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vehVOEeeMzp7YIeMZtw" x="-56" y="11"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vexVOEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zfU4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfBVOEeeMzp7YIeMZtw" x="43" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vfRVOEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zpF4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfhVOEeeMzp7YIeMZtw" x="-43" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Gn1vcRVOEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_GXLdQBVOEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gn1vchVOEeeMzp7YIeMZtw" points="[1384, 534, -643984, -643984]$[1652, 413, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQBVOEeeMzp7YIeMZtw" id="(0.22026431718061673,0.98)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQRVOEeeMzp7YIeMZtw" id="(0.844311377245509,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QsWsKhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsSBVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsKxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S0VFABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsLBVPEeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QsWsLRVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QsWr5BVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsLhVPEeeMzp7YIeMZtw" points="[1027, 517, -643984, -643984]$[1024, 473, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsLxVPEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsMBVPEeeMzp7YIeMZtw" id="(0.9880952380952381,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QsWsdhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsXxVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsdxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S1Oc4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWseBVPEeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QsWseRVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QsWr4hVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsehVPEeeMzp7YIeMZtw" points="[932, 512, -643984, -643984]$[965, 448, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsexVPEeeMzp7YIeMZtw" id="(0.62,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsfBVPEeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_jbedcRVPEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddBVPEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_kH0BVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddRVPEeeMzp7YIeMZtw" x="-1" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddhVPEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_3CwBVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddxVPEeeMzp7YIeMZtw" x="-1" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_jbedchVPEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_jbedcBVPEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jbedcxVPEeeMzp7YIeMZtw" points="[1019, 371, -643984, -643984]$[1324, 295, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QBVPEeeMzp7YIeMZtw" id="(0.5515151515151515,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QRVPEeeMzp7YIeMZtw" id="(0.0,0.5967741935483871)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_YErngBVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_YErngxVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZHmEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhBVTEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_YErnhRVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZ4bEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhhVTEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_YErngRVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_YEh2gBVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YErnghVTEeeMzp7YIeMZtw" points="[1143, 420, -643984, -643984]$[1324, 320, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJUBVTEeeMzp7YIeMZtw" id="(1.0,0.07407407407407407)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJURVTEeeMzp7YIeMZtw" id="(0.0,0.22388059701492538)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_a_WB0BVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB0xVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbbTMBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1BVTEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB1RVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbsY8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1hVTEeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_a_WB0RVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_a_MQ0BVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a_WB0hVTEeeMzp7YIeMZtw" points="[1652, 405, -643984, -643984]$[1424, 326, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosBVTEeeMzp7YIeMZtw" id="(0.0,0.15625)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosRVTEeeMzp7YIeMZtw" id="(1.0,0.31343283582089554)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_tsxKQRVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_qOaNARVTEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRBVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RaeQ8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRRVTEeeMzp7YIeMZtw" x="1" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRhVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ra8yEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRxVTEeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_tsxKQhVTEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_tsxKQBVTEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tsxKQxVTEeeMzp7YIeMZtw" points="[1379, 541, -643984, -643984]$[1143, 468, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIBVTEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIRVTEeeMzp7YIeMZtw" id="(1.0,0.7185185185185186)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_aeMUMBVhEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWr8xVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUMxVhEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QNbI0BV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNBVhEeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUNRVhEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QN6RABV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNhVhEeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_aeMUMRVhEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_aeJQ4BVhEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aeMUMhVhEeeMzp7YIeMZtw" points="[843, 524, -643984, -643984]$[1024, 524, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoBVhEeeMzp7YIeMZtw" id="(0.9955947136563876,0.51)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoRVhEeeMzp7YIeMZtw" id="(0.0,0.37037037037037035)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_8dGJABVpEeeMzp7YIeMZtw" type="Association_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJAxVpEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QK6AUBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBBVpEeeMzp7YIeMZtw" x="-2" y="-17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBRVpEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QLVeIBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBhVpEeeMzp7YIeMZtw" x="1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBxVpEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QL3poBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJCBVpEeeMzp7YIeMZtw" x="216" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCRVpEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMQrMBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJChVpEeeMzp7YIeMZtw" x="-216" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCxVpEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMmpcBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDBVpEeeMzp7YIeMZtw" x="214" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJDRVpEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QM8AoBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDhVpEeeMzp7YIeMZtw" x="-215" y="-17"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_8dGJARVpEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_8clysBVpEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8dGJAhVpEeeMzp7YIeMZtw" points="[1083, 449, -643984, -643984]$[1357, 213, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QBVpEeeMzp7YIeMZtw" id="(0.3575757575757576,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QRVpEeeMzp7YIeMZtw" id="(0.0,0.4827586206896552)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_IM27wBVqEeeMzp7YIeMZtw" type="Association_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8BVqEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeN18BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8RVqEeeMzp7YIeMZtw" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8hVqEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeuMQBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8xVqEeeMzp7YIeMZtw" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9BVqEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Je-q8BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9RVqEeeMzp7YIeMZtw" x="56" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9hVqEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfN7gBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9xVqEeeMzp7YIeMZtw" x="-56" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-BVqEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfdMEBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-RVqEeeMzp7YIeMZtw" x="56" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-hVqEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Jf1mkBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-xVqEeeMzp7YIeMZtw" x="-56" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_IM27wRVqEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_IMUJMBVqEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IM27whVqEeeMzp7YIeMZtw" points="[1735, 454, -643984, -643984]$[1512, 209, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgBVqEeeMzp7YIeMZtw" id="(0.3652694610778443,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgRVqEeeMzp7YIeMZtw" id="(1.0,0.42528735632183906)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_CBI5ABVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_15nGgRVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppUHoBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMRVtEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppqF4BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMxVtEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_CBI5ARVtEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_CBHq4BVtEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CBI5AhVtEeeMzp7YIeMZtw" points="[1924, 843, -643984, -643984]$[1890, 792, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xUBVtEeeMzp7YIeMZtw" id="(0.30985915492957744,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xURVtEeeMzp7YIeMZtw" id="(0.5434782608695652,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_PdCdcBVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_wWO9gBVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pp7ysBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkRVtEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pqPUsBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkxVtEeeMzp7YIeMZtw" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_PdCdcRVtEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_Pc_aIBVtEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PdCdchVtEeeMzp7YIeMZtw" points="[1789, 843, -643984, -643984]$[1815, 792, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8BVtEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8RVtEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_RM6qMBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_TQvYkBVtEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQBVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mTnXIBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQRVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQhVuEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUBm0BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQxVuEeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRBVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUTToBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUjLQBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRxVuEeeMzp7YIeMZtw" x="-5" y="12"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RSBVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mU04EBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSRVuEeeMzp7YIeMZtw" x="20" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RShVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mVMEcBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSxVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_RM6qMRVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_RMhooBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RM6qMhVuEeeMzp7YIeMZtw" points="[2076, 810, -643984, -643984]$[1953, 739, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkBVuEeeMzp7YIeMZtw" id="(0.0,0.7087378640776699)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkRVuEeeMzp7YIeMZtw" id="(1.0,0.5225225225225225)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trQ6JhVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trRhaxVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6JxVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6KRVuEeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6KhVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6LBVuEeeMzp7YIeMZtw" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trQ6LRVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_trPsABVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trQ6LhVuEeeMzp7YIeMZtw" points="[2289, 766, -643984, -643984]$[2255, 715, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6LxVuEeeMzp7YIeMZtw" id="(0.305,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6MBVuEeeMzp7YIeMZtw" id="(0.5408163265306123,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trRhMBVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trQ6MRVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhMRVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhMhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhMxVuEeeMzp7YIeMZtw" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhNBVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhNRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhNhVuEeeMzp7YIeMZtw" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trRhNxVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_trQTFBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhOBVuEeeMzp7YIeMZtw" points="[2154, 766, -643984, -643984]$[2180, 715, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhORVuEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhOhVuEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_trRhVBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_trRhhBVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhVRVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhVhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhVxVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWBVuEeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhWRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhWhVuEeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWxVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhXRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhXhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYBVuEeeMzp7YIeMZtw" x="-5" y="12"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhYRVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhYhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYxVuEeeMzp7YIeMZtw" x="20" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_trRhZBVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhZRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhZhVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_trRhZxVuEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_trQ6IBVuEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhaBVuEeeMzp7YIeMZtw" points="[2174, 573, -643984, -643984]$[2051, 502, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhaRVuEeeMzp7YIeMZtw" id="(0.8888888888888888,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhahVuEeeMzp7YIeMZtw" id="(0.389937106918239,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_BMxx8RVvEeeMzp7YIeMZtw" type="Dependency_Edge" source="_7uQ60BVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9BVvEeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HxRkQBVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9RVvEeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9hVvEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Hx-u4BVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9xVvEeeMzp7YIeMZtw" x="1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_BMxx8hVvEeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_BMxx8BVvEeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BMxx8xVvEeeMzp7YIeMZtw" points="[1968, 789, -643984, -643984]$[2245, 718, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4BVvEeeMzp7YIeMZtw" id="(0.993421052631579,0.61)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4RVvEeeMzp7YIeMZtw" id="(0.0,0.5855855855855856)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSDRV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHlBV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSDhV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSDxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSEBV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSERV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSEhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSExV-EeeMzp7YIeMZtw" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSFBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxRcwBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSFRV-EeeMzp7YIeMZtw" points="[519, 1169, -643984, -643984]$[519, 1092, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFhV-EeeMzp7YIeMZtw" id="(0.44370860927152317,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFxV-EeeMzp7YIeMZtw" id="(0.19285714285714287,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSGBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxTSIRV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSGhV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSHBV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSHRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPAhxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSHhV-EeeMzp7YIeMZtw" points="[291, 907, -643984, -643984]$[290, 985, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSHxV-EeeMzp7YIeMZtw" id="(0.7440476190476191,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSIBV-EeeMzp7YIeMZtw" id="(0.6115107913669064,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSOhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxT5TxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSOxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSPRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPhV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSPxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPnkxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSQBV-EeeMzp7YIeMZtw" points="[253, 393, -643984, -643984]$[368, 308, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQRV-EeeMzp7YIeMZtw" id="(0.49489795918367346,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQhV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSdRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5HhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSdhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSdxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSeBV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSeRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxSD3BV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSehV-EeeMzp7YIeMZtw" points="[427, 677, -643984, -643984]$[352, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSexV-EeeMzp7YIeMZtw" id="(0.1111111111111111,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSfBV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSfRV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSfhV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSfxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgBV-EeeMzp7YIeMZtw" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSgRV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSghV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgxV-EeeMzp7YIeMZtw" x="-1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShBV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTShRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTShhV-EeeMzp7YIeMZtw" x="51" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShxV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSiBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSiRV-EeeMzp7YIeMZtw" x="-52" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSihV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSixV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjBV-EeeMzp7YIeMZtw" x="51" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSjRV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSjhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjxV-EeeMzp7YIeMZtw" x="-52" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSkBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxOZdBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSkRV-EeeMzp7YIeMZtw" points="[903, 338, -643984, -643984]$[572, 230, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkhV-EeeMzp7YIeMZtw" id="(0.0,0.35)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkxV-EeeMzp7YIeMZtw" id="(1.0,0.7425742574257426)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSlBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5ahV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSlRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSlhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSlxV-EeeMzp7YIeMZtw" x="1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSmBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQOsBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSmRV-EeeMzp7YIeMZtw" points="[1424, 636, -643984, -643984]$[1515, 572, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmhV-EeeMzp7YIeMZtw" id="(0.5982142857142857,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmxV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxTSnBV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxT5gRV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSnRV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSnhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSnxV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSoRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSohV-EeeMzp7YIeMZtw" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSpRV-EeeMzp7YIeMZtw" x="44" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSphV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqBV-EeeMzp7YIeMZtw" x="-43" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSqRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSqhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqxV-EeeMzp7YIeMZtw" x="44" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSrBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSrRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSrhV-EeeMzp7YIeMZtw" x="-43" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSrxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxSD5hV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSsBV-EeeMzp7YIeMZtw" points="[862, 51, -643984, -643984]$[572, 58, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSsRV-EeeMzp7YIeMZtw" id="(0.0,0.1683673469387755)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSshV-EeeMzp7YIeMZtw" id="(1.0,0.17491749174917492)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5ABV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxT5gRV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ARV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5AhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5AxV-EeeMzp7YIeMZtw" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5BRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5BhV-EeeMzp7YIeMZtw" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5CRV-EeeMzp7YIeMZtw" x="15" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ChV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DBV-EeeMzp7YIeMZtw" x="-15" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5DRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5DhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DxV-EeeMzp7YIeMZtw" x="15" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5EBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5ERV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5EhV-EeeMzp7YIeMZtw" x="-15" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5ExV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxOZeBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5FBV-EeeMzp7YIeMZtw" points="[935, 317, -643984, -643984]$[928, 214, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FRV-EeeMzp7YIeMZtw" id="(0.23958333333333334,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FhV-EeeMzp7YIeMZtw" id="(0.3173076923076923,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5FxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5GBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5GRV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5GhV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQOpBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5GxV-EeeMzp7YIeMZtw" points="[213, 650, -643984, -643984]$[217, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HBV-EeeMzp7YIeMZtw" id="(0.27976190476190477,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HRV-EeeMzp7YIeMZtw" id="(0.3112244897959184,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5RxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHYRV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5SBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5SRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ShV-EeeMzp7YIeMZtw" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5SxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1uRV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5TBV-EeeMzp7YIeMZtw" points="[104, 683, -643984, -643984]$[156, 566, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5TRV-EeeMzp7YIeMZtw" id="(0.6101694915254238,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5ThV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxT5tRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgZBV-EeeMzp7YIeMZtw" target="_QxSq4xV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5thV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5txV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5uBV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxSD1BV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5uRV-EeeMzp7YIeMZtw" points="[717, 673, -643984, -643984]$[717, 564, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5uhV-EeeMzp7YIeMZtw" id="(0.2236024844720497,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgEBV-EeeMzp7YIeMZtw" id="(0.3220338983050847,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxUgPhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxSq4xV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgPxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgQRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQhV-EeeMzp7YIeMZtw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxUgQxV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxPnlBV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxUgRBV-EeeMzp7YIeMZtw" points="[660, 412, -643984, -643984]$[572, 308, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRRV-EeeMzp7YIeMZtw" id="(0.0,0.13636363636363635)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRhV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHIBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHsRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L2DOABWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHIhV-EeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L3NEkBWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHJBV-EeeMzp7YIeMZtw" x="-1" y="57"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHJRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Dependency" href="model.uml#_QxOZcxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHJhV-EeeMzp7YIeMZtw" points="[716, 1196, -643984, -643984]$[632, 1108, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHJxV-EeeMzp7YIeMZtw" id="(0.3553921568627451,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHKBV-EeeMzp7YIeMZtw" id="(0.65,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHKRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVuSxV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHKhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHKxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHLBV-EeeMzp7YIeMZtw" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHLRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxPnlhV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHLhV-EeeMzp7YIeMZtw" points="[1589, 633, -643984, -643984]$[1589, 572, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHLxV-EeeMzp7YIeMZtw" id="(0.19895287958115182,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHMBV-EeeMzp7YIeMZtw" id="(0.30833333333333335,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHShV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSIRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHSxV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHTRV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHThV-EeeMzp7YIeMZtw" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUBV-EeeMzp7YIeMZtw" x="1" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHURV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHUhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUxV-EeeMzp7YIeMZtw" x="33" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVBV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHVRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHVhV-EeeMzp7YIeMZtw" x="-97" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVxV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHWRV-EeeMzp7YIeMZtw" x="35" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHWhV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHXBV-EeeMzp7YIeMZtw" x="-13" y="3"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHXRV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Association" href="model.uml#_QxRcwRV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHXhV-EeeMzp7YIeMZtw" points="[334, 1039, -643984, -643984]$[539, 1024, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHXxV-EeeMzp7YIeMZtw" id="(1.0,0.4298850574712644)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHYBV-EeeMzp7YIeMZtw" id="(0.0,0.3511450381679389)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QxVHzBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHMRV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHzRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHzhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHzxV-EeeMzp7YIeMZtw" x="-1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QxVH0BV-EeeMzp7YIeMZtw"/>
-    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1sxV-EeeMzp7YIeMZtw"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVH0RV-EeeMzp7YIeMZtw" points="[1686, 645, -643984, -643984]$[1601, 581, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0hV-EeeMzp7YIeMZtw" id="(0.1242603550295858,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0xV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_AN9ZEBVKEeeMzp7YIeMZtw" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_td6vkBVLEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkhVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_td6vkxVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_td6vlBVLEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vlRVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vlhVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vlxVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vmBVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vmRVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vmhVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_td6vmxVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_td6vnBVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vnRVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vnhVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_td6vnxVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_td6voBVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_td6voRVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_td6vohVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6voxVLEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_tdw-kBVLEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_td6vkRVLEeeMzp7YIeMZtw" x="2399" y="1088"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_3Heq0RVLEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq0xVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3Heq1BVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Heq1RVLEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq1hVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq1xVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq2BVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq2RVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq2hVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq2xVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq3BVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq3RVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq3hVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq3xVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3Heq4BVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3Heq4RVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3Heq4hVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3Heq4xVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq5BVLEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_3Heq0BVLEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Heq0hVLEeeMzp7YIeMZtw" x="2519" y="1090"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_7yg2kRVLEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2kxVLEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7yg2lBVLEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7yg2lRVLEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2lhVLEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2lxVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2mBVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2mRVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2mhVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2mxVLEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2nBVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2nRVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2nhVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2nxVLEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7yg2oBVLEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7yg2oRVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7yg2ohVLEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7yg2oxVLEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2pBVLEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_7yg2kBVLEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7yg2khVLEeeMzp7YIeMZtw" x="2651" y="1080"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_0EXCoBVMEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCohVMEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0EXCoxVMEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0EXCpBVMEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCpRVMEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_-U5eUBVMEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_-UmjYBVMEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-U5eURVMEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_FrX8oBVNEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_FrEaoBVNEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FrX8oRVNEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_OA0n0BVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_OAX74BVREeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OA0n0RVREeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCphVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCpxVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCqBVMEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCqRVMEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCqhVMEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCqxVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCrBVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCrRVMEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCrhVMEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_0EXCrxVMEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0EXCsBVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_0EXCsRVMEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EXCshVMEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCsxVMEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_0EEHsBVMEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EXCoRVMEeeMzp7YIeMZtw" x="2503" y="934"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_4sOJIRVNEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJIxVNEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4sOJJBVNEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4sOJJRVNEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJJhVNEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJJxVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJKBVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJKRVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJKhVNEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJKxVNEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_5RXoIBVOEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_5QxLMBVOEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5RXoIRVOEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJLBVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJLRVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJLhVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJLxVNEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_4sOJMBVNEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_4sOJMRVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_4sOJMhVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_4sOJMxVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJNBVNEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_4sOJIBVNEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4sOJIhVNEeeMzp7YIeMZtw" x="2638" y="739" width="227"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_9zOfMRVNEeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfMxVNEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_9zOfNBVNEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9zOfNRVNEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfNhVNEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfNxVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfOBVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfORVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfOhVNEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfOxVNEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfPBVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfPRVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfPhVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfPxVNEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9zOfQBVNEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9zOfQRVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9zOfQhVNEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9zOfQxVNEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfRBVNEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_9zOfMBVNEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9zOfMhVNEeeMzp7YIeMZtw" x="2176" y="799" height="62"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QsWr8xVPEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9BVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWr9RVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr9hVPEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr9xVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr-BVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWr-RVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWr-hVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWr-xVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWr_BVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QsWr_RVPEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QsWr8RVPEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWr_hVPEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWr_xVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsABVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsARVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsAhVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsAxVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsBBVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsBRVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsBhVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsBxVPEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QsWr7xVPEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsCxVPEeeMzp7YIeMZtw" x="1418" y="929" width="227"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QsWsSBVPEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsSRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsShVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsSxVPEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsTBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsTRVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsThVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsTxVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsUBVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsURVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsUhVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsUxVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsVBVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsVRVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsVhVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsVxVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsWBVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsWRVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsWhVPEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QsWr4xVPEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsXhVPEeeMzp7YIeMZtw" x="1983" y="1091"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QsWsXxVPEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYBVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsYRVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsYhVPEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsYxVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsZBVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsZRVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsZhVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsZxVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsaBVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsaRVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsahVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsaxVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsbBVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsbRVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsbhVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsbxVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWscBVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWscRVPEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QsWr4RVPEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsdRVPEeeMzp7YIeMZtw" x="1732" y="1088"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QsWslBVPEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslRVPEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWslhVPEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWslxVPEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsmBVPEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QsWsmRVPEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QsWr7RVPEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsmhVPEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_SCRggBVQEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_SBh5oBVQEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SCRggRVQEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_bQ1FUBVREeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_bQOoYBVREeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bQ1FURVREeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsnRVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsnhVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsnxVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsoBVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsoRVPEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_uK47kBVREeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_uKTFsBVREeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uK47kRVREeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWsohVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsoxVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWspBVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWspRVPEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QsWsphVPEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QsWspxVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QsWsqBVPEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QsWsqRVPEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsqhVPEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QsWr7BVPEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsWsrhVPEeeMzp7YIeMZtw" x="1826" y="930"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_D3T2oBVQEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2ohVQEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_D3T2oxVQEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_D3T2pBVQEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2pRVQEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2phVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2pxVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2qBVQEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2qRVQEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2qhVQEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2qxVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2rBVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2rRVQEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2rhVQEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_D3T2rxVQEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_D3T2sBVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_D3T2sRVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_D3T2shVQEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2sxVQEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D3T2oRVQEeeMzp7YIeMZtw" x="1783" y="835" height="29"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-j608RVQEeeMzp7YIeMZtw" type="Enumeration_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_-j608xVQEeeMzp7YIeMZtw" type="Enumeration_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_-j609BVQEeeMzp7YIeMZtw" type="Enumeration_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_-j609RVQEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-j609hVQEeeMzp7YIeMZtw" type="Enumeration_LiteralCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-j609xVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-j60-BVQEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-j60-RVQEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j60-hVQEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Enumeration" href="model.uml#_-j608BVQEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-j608hVQEeeMzp7YIeMZtw" x="2184" y="965" height="58"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_31XnYRVSEeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_31XnYxVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_31XnZBVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_31XnZRVSEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnZhVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnZxVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnaBVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnaRVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnahVSEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_31XnaxVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_31XnbBVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnbRVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XnbhVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnbxVSEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_31XncBVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_31XncRVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_31XnchVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_31XncxVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XndBVSEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_31XnYBVSEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31XnYhVSEeeMzp7YIeMZtw" x="2177" y="744" height="52"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_6giNIBVSEeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIhVSEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6giNIxVSEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6giNJBVSEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNJRVSEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_U78U8BVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U78U8RVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNJhVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNJxVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNKBVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNKRVSEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNKhVSEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VJeaoBVTEeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VJeaoRVTEeeMzp7YIeMZtw" key="collapsed" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_ETBa4BVTEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_ESR0ABVTEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ETBa4RVTEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNKxVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNLBVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNLRVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNLhVSEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_6giNLxVSEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_6giNMBVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_6giNMRVSEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_6giNMhVSEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNMxVSEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_6gYcIBVSEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6giNIRVSEeeMzp7YIeMZtw" x="2175" y="864" width="100" height="67"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qOaNARVTEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_qOaNAxVTEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qOjW8BVTEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_qOjW8RVTEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW8hVTEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_hxRLIBVfEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_hwhkQBVfEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hxRLIRVfEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_xW6N0BVgEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_xVpCgBVgEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xW6N0RVgEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW8xVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW9BVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW9RVTEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW9hVTEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW9xVTEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW-BVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW-RVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW-hVTEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjW-xVTEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qOjW_BVTEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qOjW_RVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qOjW_hVTEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qOjW_xVTEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOjXABVTEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_qOaNABVTEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qOaNAhVTEeeMzp7YIeMZtw" x="2185" y="1100"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o3hKMBVhEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYUBVhEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_o3iYURVhEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_o3iYUhVhEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYUxVhEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYVBVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYVRVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYVhVhEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYVxVhEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYWBVhEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_xEQiIBVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_xDYYYBVhEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xEQiIRVhEeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_6AI4ABVhEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_5_YDABVhEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6AI4ARVhEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYWRVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYWhVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYWxVhEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYXBVhEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3iYXRVhEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3iYXhVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3iYXxVhEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3iYYBVhEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3iYYRVhEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_o3bDkBVhEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hKMRVhEeeMzp7YIeMZtw" x="2159" y="652" height="87"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_T_A7MBVqEeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MhVqEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_T_A7MxVqEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_T_A7NBVqEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7NRVqEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7NhVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7NxVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7OBVqEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7ORVqEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7OhVqEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_aBtdcBVqEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_aBVC8BVqEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aBtdcRVqEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7OxVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7PBVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7PRVqEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7PhVqEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_T_A7PxVqEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_T_A7QBVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_T_A7QRVqEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_T_A7QhVqEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7QxVqEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_T-934BVqEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T_A7MRVqEeeMzp7YIeMZtw" x="2306" y="1253"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_wWO9gBVsEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9ghVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_wWO9gxVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wWO9hBVsEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9hRVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9hhVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9hxVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9iBVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9iRVsEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9ihVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_zWxWUBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_zWDkoBVsEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zWxWURVsEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9ixVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9jBVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9jRVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9jhVsEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_wWO9jxVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_wWO9kBVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_wWO9kRVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_wWO9khVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9kxVsEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_wWBiIBVsEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wWO9gRVsEeeMzp7YIeMZtw" x="2216" y="1415"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_15nGgRVsEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_15nGgxVsEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_15nGhBVsEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_15nGhRVsEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGhhVsEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGhxVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGiBVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGiRVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGihVsEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGixVsEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_6hM8sBVsEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_6gpjEBVsEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6hM8sRVsEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGjBVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGjRVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGjhVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGjxVsEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_15nGkBVsEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_15nGkRVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_15nGkhVsEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_15nGkxVsEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGlBVsEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_15nGgBVsEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_15nGghVsEeeMzp7YIeMZtw" x="2371" y="1415"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_TQvYkBVtEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkhVtEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_TQvYkxVtEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TQvYlBVtEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TQvYlRVtEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_Fmv4UBVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_Fl5jwBVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fmv4URVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TQvYlhVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TQvYlxVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQvYmBVtEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYmRVtEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNwBVtEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_BYH7wBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_BXlJMBVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BYH7wRVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNwRVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNwhVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNwxVtEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNxBVtEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TQxNxRVtEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TQxNxhVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_TQxNxxVtEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TQxNyBVtEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQxNyRVtEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_TQsVQBVtEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TQvYkRVtEeeMzp7YIeMZtw" x="2611" y="1310"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_trQ6MRVuEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MhVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6MxVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6NBVuEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6NRVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6NhVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6NxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6OBVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6ORVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6OhVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_trQ6OxVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_trQ6JRVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6PBVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6PRVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6PhVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6PxVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6QBVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trQ6QRVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trQ6QhVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trQ6QxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trQ6RBVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6RRVuEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_trQ6JBVuEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trQ6SRVuEeeMzp7YIeMZtw" x="2956" y="1271"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_trRhOxVuEeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPBVuEeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhPRVuEeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhPhVuEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhPxVuEeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhQBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhQRVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhQhVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhQxVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhRBVuEeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_trRhRRVuEeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_trQTGBVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhRhVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhRxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhSBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhSRVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhShVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhSxVuEeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhTBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhTRVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhThVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhTxVuEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_trQTFxVuEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhUxVuEeeMzp7YIeMZtw" x="3046" y="1109"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_trRhaxVuEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbBVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhbRVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhbhVuEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhbxVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhcBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhcRVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhchVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhcxVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhdBVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_trRhdRVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_trQTFhVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhdhVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhdxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRheBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRheRVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhehVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhexVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhfBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhfRVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhfhVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhfxVuEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_trQTFRVuEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhgxVuEeeMzp7YIeMZtw" x="3139" y="1275"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_trRhhBVuEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhRVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhhhVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhhxVuEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhiBVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_trRhiRVuEeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_trQTERVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhihVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhixVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhjBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhjRVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhjhVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhjxVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_trRhkBVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_trQTExVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhkRVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhkhVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhkxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhlBVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhlRVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_trRhlhVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_trRhlxVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_trRhmBVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_trRhmRVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhmhVuEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_trQTEBVuEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_trRhnhVuEeeMzp7YIeMZtw" x="2838" y="959"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_7uQ60BVuEeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60RVuEeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7uQ60hVuEeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ60xVuEeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ61BVuEeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ61RVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ61hVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ61xVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ62BVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ62RVuEeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_7uQ62hVuEeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_7uPssRVuEeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7uQ62xVuEeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ63BVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ63RVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ63hVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ63xVuEeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_7uQ64BVuEeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7uQ64RVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_7uQ64hVuEeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_7uQ64xVuEeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ65BVuEeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_7uPssBVuEeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uQ66BVuEeeMzp7YIeMZtw" x="2841" y="1127"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_OgQLcBV1EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLchV1EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_OgQLcxV1EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OgQLdBV1EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_OgQLdRV1EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_SBongBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_SBA8cBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SBongRV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_VfZH0BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_Ve1uMBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VfZH0RV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_agXHUBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_afrK0BV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_agXHURV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_hKpOABV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_hKSosBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hKpOARV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_hka_8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_hkFowBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hka_8RV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_hlW0EBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_hk8kYBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hlW0ERV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_uwAQcBV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_uvbosBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uwAQcRV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_1l2t8BV1EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_1lKKYBV1EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1l2t8RV1EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ARw3ABV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_AQ-M0BV2EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ARw3ARV2EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_JGnX0BV2EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_JFxqUBV2EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JGnX0RV2EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OgQLdhV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OgQLdxV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgQLeBV1EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLeRV1EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSAoBV1EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_avHfkBV2EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_auaU8BV2EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_avHfkRV2EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAoRV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSAohV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAoxV1EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSApBV1EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_OgSApRV1EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OgSAphV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OgSApxV1EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OgSAqBV1EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgSAqRV1EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_OgNIIBV1EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgQLcRV1EeeMzp7YIeMZtw" x="990" y="834"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxSq4xV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5BV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq5RV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq5hV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq5xV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq6BV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq6RV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq6hV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq6xV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq7BV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq7RV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq7hV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq7xV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq8BV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq8RV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSq8hV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSq8xV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSq9BV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq9RV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQ1sBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSq-RV-EeeMzp7YIeMZtw" x="670" y="398" width="177" height="176"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxSq-hV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq-xV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxSq_BV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSq_RV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSq_hV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxSq_xV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQ1thV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrABV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxSrARV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQ1txV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxSrAhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrAxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrBBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrBRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrBhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrBxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrCBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrCRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrChV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrCxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxSrDBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxSrDRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxSrDhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxSrDxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrEBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQ1tRV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxSrFBV-EeeMzp7YIeMZtw" x="1702" y="198"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxTR8BV-EeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8RV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTR8hV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR8xV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR9BV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTR9RV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTR9hV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTR9xV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTR-BV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTR-RV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxTR-hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxRcxhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR-xV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxTR_BV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxRcxxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_RV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxTR_hV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxRcyBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTR_xV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSABV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSARV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSAhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSAxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSBBV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSBRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSBhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSBxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSCBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_QxRcxRV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSDBV-EeeMzp7YIeMZtw" x="557" y="1010" width="140" height="131"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxTSIRV-EeeMzp7YIeMZtw" type="Interface_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIhV-EeeMzp7YIeMZtw" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSIxV-EeeMzp7YIeMZtw" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSJBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSJRV-EeeMzp7YIeMZtw" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSJhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSJxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSKBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSKRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSKhV-EeeMzp7YIeMZtw" type="Interface_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxTSKxV-EeeMzp7YIeMZtw" type="Operation_InterfaceOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxPnkhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSLBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSLRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSLhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSLxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSMBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSMRV-EeeMzp7YIeMZtw" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSMhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSMxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSNBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSNRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Interface" href="model.uml#_QxPnkBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSORV-EeeMzp7YIeMZtw" x="215" y="995" width="139" height="145"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxTSQxV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSRRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSRhV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSRxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxTSSBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPnmRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSSRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSShV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSSxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSTBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSTRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSThV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSTxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSUBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSURV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSUhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSUxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSVBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSVRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSVhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSVxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxPnmBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSWxV-EeeMzp7YIeMZtw" x="920" y="357"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxTSXBV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSXhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSXxV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSYBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxTSYRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOthV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSYhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSYxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSZBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSZRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSZhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSZxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSaBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSaRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSahV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSaxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxTSbBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxTSbRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxTSbhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxTSbxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTScBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQOtRV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxTSdBV-EeeMzp7YIeMZtw" x="1273" y="413" width="240" height="199"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxT5HhV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5HxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5IBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5IRV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5IhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxT5IxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxSD3RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5JRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxSD3hV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5JhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5JxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxSD3xV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5KBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5KRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5KhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5KxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5LBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5LRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxT5LhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD4BV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5LxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5MBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD4RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5MhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD4hV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5MxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5NBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD4xV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5NhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD5BV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5NxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5OBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD5RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ORV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5OhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5OxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5PBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5PRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5PhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5PxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5QBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5QRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5QhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxSD2xV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5RhV-EeeMzp7YIeMZtw" x="442" y="603" width="189" height="249"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxT5TxV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5UBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5URV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5UhV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5UxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxT5VBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAhRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5VhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAhhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5VxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5WBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5WRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5WhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5WxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5XBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5XRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5XhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5XxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5YBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5YRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5YhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5YxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5ZBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5ZRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ZhV-EeeMzp7YIeMZtw" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5ZxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxPAhBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5aRV-EeeMzp7YIeMZtw" x="166" y="403" width="196" height="173"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxT5ahV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5axV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5bBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5bRV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5bhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5bxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5cBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5cRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5chV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5cxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5dBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5dRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5dhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5dxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5eBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5eRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5ehV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5exV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5fBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQOrxV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5gBV-EeeMzp7YIeMZtw" x="1115" y="676"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxT5gRV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ghV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5gxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5hBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5hRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5hhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5hxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5iBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5iRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5ihV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxT5ixV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSq4hV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5jBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5jRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5jhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5jxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5kBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5kRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5khV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5kxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5lBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5lRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxSq4BV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5mRV-EeeMzp7YIeMZtw" x="868" y="36" width="208" height="196"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxT5mhV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5mxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5nBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5nRV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5nhV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxT5nxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOoRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5oBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxT5oRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOohV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ohV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5oxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5pBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5pRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5phV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5pxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5qBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5qRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5qhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5qxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxT5rBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxT5rRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxT5rhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxT5rxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5sBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQOoBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxT5tBV-EeeMzp7YIeMZtw" x="1551" y="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxUgERV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgEhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgExV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgFBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgFRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgFhV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgFxV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgGBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAiRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgGhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAihV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgGxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgHBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAixV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgHhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAjRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgHxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgIBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAjhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgIhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAkBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgIxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgJBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAjBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgJhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAjxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgJxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgKBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgKRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgKhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgKxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgLBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxUgLRV-EeeMzp7YIeMZtw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxUgLhV-EeeMzp7YIeMZtw" key="collapsed" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgLxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxPAkRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgMBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgMRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgMhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgMxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgNBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgNRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgNhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgNxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgOBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgORV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxPAiBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgPRV-EeeMzp7YIeMZtw" x="378" y="15" width="204" height="303"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxUgRxV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgSRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgShV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgSxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxUgTBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOshV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgThV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOsxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgTxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOtBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgURV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgUhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgUxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgVBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgVRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgVxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgWBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgWRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgWhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgXBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgXRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgXhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgXxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQOsRV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgYxV-EeeMzp7YIeMZtw" x="1344" y="200"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxUgZBV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgZhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgZxV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgaBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxUgaRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxSD1RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgahV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgaxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgbBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgbRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgbhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgbxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxUgcBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD1hV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgchV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD1xV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgcxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgdBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD2BV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgdhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD2RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgdxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgeBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxSD2hV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgeRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgehV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgexV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgfBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgfRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgfhV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgfxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUggBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUggRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgghV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxSD0xV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUghhV-EeeMzp7YIeMZtw" x="691" y="683" width="161" height="167"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxUgnhV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgnxV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgoBV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgoRV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgohV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxUgoxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOpRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgpBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgpRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOphV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgphV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgpxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQOpxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgqBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgqRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgqhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgqxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgrBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgrRV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxUgrhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOqBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgrxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgsBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOqRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgshV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOqhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgsxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgtBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOqxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUgthV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOrBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgtxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUguBV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOrRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguRV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxUguhV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQOrhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUguxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgvBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgvRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgvhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgvxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxUgwBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxUgwRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxUgwhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxUgwxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgxBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQOoxV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxUgyBV-EeeMzp7YIeMZtw" x="176" y="660" width="168" height="257"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxVHMRV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHMxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHNRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxVHNhV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxQ1tBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHNxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHOBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHORV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHOhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHOxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHPBV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHPRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHPhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHPxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHQBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHQRV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHQhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHQxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHRBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHRRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQ1shV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHSRV-EeeMzp7YIeMZtw" x="1598" y="675"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxVHYRV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYhV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHYxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHZBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHZRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHZhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHZxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHaBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHaRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHahV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxVHaxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1uhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHbRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHbhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHbxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHcBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHcRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1vxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHchV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHcxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHdRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHdhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHdxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1whV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHeBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHeRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1wxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHehV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHexV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHfRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHfhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHfxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xhV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHgBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHgRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1xxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHghV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHgxV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yBV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHhRV-EeeMzp7YIeMZtw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="model.uml#_QxQ1yRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHhhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHhxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHiBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHiRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHihV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHixV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHjBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHjRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHjhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHjxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxQ1uBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHkxV-EeeMzp7YIeMZtw" x="-69" y="660" width="177" height="412"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxVHlBV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlRV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHlhV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHlxV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHmBV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxVHmRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAgRV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHmhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHmxV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAghV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnBV-EeeMzp7YIeMZtw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QxVHnRV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPAgxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHnhV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHnxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHoBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHoRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHohV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHoxV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHpBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHpRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHphV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHpxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHqBV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHqRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHqhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHqxV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHrBV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxPAgBV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHsBV-EeeMzp7YIeMZtw" x="501" y="1216" width="151" height="141"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxVHsRV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHshV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHsxV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtBV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHtRV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxVHthV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxSD0RV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHtxV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHuhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHuxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHvBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHvRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHvhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHvxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHwBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHwRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHwhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVHwxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVHxBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVHxRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVHxhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHxxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxSD0BV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVHyxV-EeeMzp7YIeMZtw" x="689" y="1216" width="136" height="136"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_QxVuSxV-EeeMzp7YIeMZtw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTBV-EeeMzp7YIeMZtw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVuTRV-EeeMzp7YIeMZtw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuThV-EeeMzp7YIeMZtw" y="5"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuTxV-EeeMzp7YIeMZtw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_QxVuUBV-EeeMzp7YIeMZtw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="model.uml#_QxPnlxV-EeeMzp7YIeMZtw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVuURV-EeeMzp7YIeMZtw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuUhV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuUxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuVBV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuVRV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuVhV-EeeMzp7YIeMZtw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuVxV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuWBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuWRV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuWhV-EeeMzp7YIeMZtw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_QxVuWxV-EeeMzp7YIeMZtw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_QxVuXBV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_QxVuXRV-EeeMzp7YIeMZtw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_QxVuXhV-EeeMzp7YIeMZtw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuXxV-EeeMzp7YIeMZtw"/>
+    </children>
+    <element xmi:type="uml:Class" href="model.uml#_QxPnlRV-EeeMzp7YIeMZtw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QxVuYxV-EeeMzp7YIeMZtw" x="1309" y="673"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_AN9ZERVKEeeMzp7YIeMZtw" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_AN9ZEhVKEeeMzp7YIeMZtw"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_AN9ZExVKEeeMzp7YIeMZtw">
+    <owner xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
+  </styles>
+  <element xmi:type="uml:Model" href="model.uml#_oX-IkBPOEeeugOD0sSUlEg"/>
+  <edges xmi:type="notation:Connector" xmi:id="_d3PDsBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_td6vkBVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_d3PDsxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfG6EBVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_d3PDtBVNEeeMzp7YIeMZtw" x="1" y="38"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_d3PDsRVNEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_d28IwBVNEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d3PDshVNEeeMzp7YIeMZtw" points="[1619, 526, -643984, -643984]$[1652, 462, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0BVNEeeMzp7YIeMZtw" id="(0.63,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIzU0RVNEeeMzp7YIeMZtw" id="(0.0,0.7734375)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_g_M6MBVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_3Heq0RVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_g_M6MxVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfjmABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_g_M6NBVNEeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_g_M6MRVNEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_g-wOQBVNEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_M6MhVNEeeMzp7YIeMZtw" points="[1714, 531, -643984, -643984]$[1711, 487, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_EBVNEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_o_ERVNEeeMzp7YIeMZtw" id="(0.45925925925925926,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_iOWN4BVNEeeMzp7YIeMZtw" type="Generalization_Edge" source="_7yg2kRVLEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iOWN4xVNEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qgc94BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iOWN5BVNEeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_iOWN4RVNEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_iN5h8BVNEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iOWN4hVNEeeMzp7YIeMZtw" points="[1832, 495, -643984, -643984]$[1787, 464, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50BVNEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iOy50RVNEeeMzp7YIeMZtw" id="(1.0,0.7890625)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AhSn8RVOEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4BVOEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Qf2g8BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4RVOEeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ahbx4hVOEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QgTM4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ahbx4xVOEeeMzp7YIeMZtw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AhSn8hVOEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_AhSn8BVOEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AhSn8xVOEeeMzp7YIeMZtw" points="[1709, 375, -643984, -643984]$[1709, 347, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwBVOEeeMzp7YIeMZtw" id="(0.12574850299401197,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AiLYwRVOEeeMzp7YIeMZtw" id="(1.0,0.5967741935483871)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Gn1vcBVOEeeMzp7YIeMZtw" type="Association_Edge" source="_4sOJIRVNEeeMzp7YIeMZtw" target="_0EXCoBVMEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vcxVOEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3yl9ABVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdBVOEeeMzp7YIeMZtw" x="1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdRVOEeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zCo8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vdhVOEeeMzp7YIeMZtw" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vdxVOEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zMZ8BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1veBVOEeeMzp7YIeMZtw" x="-5" y="21"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1veRVOEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zVj4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vehVOEeeMzp7YIeMZtw" x="-56" y="11"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vexVOEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zfU4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfBVOEeeMzp7YIeMZtw" x="43" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Gn1vfRVOEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3zpF4BVOEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Gn1vfhVOEeeMzp7YIeMZtw" x="-43" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Gn1vcRVOEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_GXLdQBVOEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gn1vchVOEeeMzp7YIeMZtw" points="[1384, 534, -643984, -643984]$[1652, 413, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQBVOEeeMzp7YIeMZtw" id="(0.22026431718061673,0.98)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GpLzQRVOEeeMzp7YIeMZtw" id="(0.844311377245509,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QsWsKhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsSBVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsKxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S0VFABVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWsLBVPEeeMzp7YIeMZtw" y="39"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QsWsLRVPEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QsWr5BVPEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsLhVPEeeMzp7YIeMZtw" points="[1027, 517, -643984, -643984]$[1024, 473, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsLxVPEeeMzp7YIeMZtw" id="(0.46,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsMBVPEeeMzp7YIeMZtw" id="(0.9880952380952381,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QsWsdhVPEeeMzp7YIeMZtw" type="Generalization_Edge" source="_QsWsXxVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QsWsdxVPEeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S1Oc4BVPEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QsWseBVPEeeMzp7YIeMZtw" y="39"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QsWseRVPEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QsWr4hVPEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsWsehVPEeeMzp7YIeMZtw" points="[932, 512, -643984, -643984]$[965, 448, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsexVPEeeMzp7YIeMZtw" id="(0.62,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QsWsfBVPEeeMzp7YIeMZtw" id="(0.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_jbedcRVPEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_9zOfMRVNEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddBVPEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_kH0BVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddRVPEeeMzp7YIeMZtw" x="-1" y="39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jbeddhVPEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_S_3CwBVTEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jbeddxVPEeeMzp7YIeMZtw" x="-1" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jbedchVPEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_jbedcBVPEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jbedcxVPEeeMzp7YIeMZtw" points="[1019, 371, -643984, -643984]$[1324, 295, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QBVPEeeMzp7YIeMZtw" id="(0.5515151515151515,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcg_QRVPEeeMzp7YIeMZtw" id="(0.0,0.5967741935483871)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_YErngBVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_YErngxVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZHmEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhBVTEeeMzp7YIeMZtw" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_YErnhRVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RZ4bEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnhhVTEeeMzp7YIeMZtw" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_YErngRVTEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_YEh2gBVTEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YErnghVTEeeMzp7YIeMZtw" points="[1143, 420, -643984, -643984]$[1324, 320, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJUBVTEeeMzp7YIeMZtw" id="(1.0,0.07407407407407407)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFuJURVTEeeMzp7YIeMZtw" id="(0.0,0.22388059701492538)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_a_WB0BVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_6giNIBVSEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB0xVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbbTMBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1BVTEeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_a_WB1RVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RbsY8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_a_WB1hVTEeeMzp7YIeMZtw" x="-1" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_a_WB0RVTEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_a_MQ0BVTEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a_WB0hVTEeeMzp7YIeMZtw" points="[1652, 405, -643984, -643984]$[1424, 326, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosBVTEeeMzp7YIeMZtw" id="(0.0,0.15625)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bAFosRVTEeeMzp7YIeMZtw" id="(1.0,0.31343283582089554)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_tsxKQRVTEeeMzp7YIeMZtw" type="Dependency_Edge" source="_qOaNARVTEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRBVTEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RaeQ8BVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRRVTEeeMzp7YIeMZtw" x="1" y="39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_tsxKRhVTEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ra8yEBVhEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_tsxKRxVTEeeMzp7YIeMZtw" x="-1" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_tsxKQhVTEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_tsxKQBVTEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tsxKQxVTEeeMzp7YIeMZtw" points="[1379, 541, -643984, -643984]$[1143, 468, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIBVTEeeMzp7YIeMZtw" id="(0.45,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ttqiIRVTEeeMzp7YIeMZtw" id="(1.0,0.7185185185185186)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_aeMUMBVhEeeMzp7YIeMZtw" type="Dependency_Edge" source="_QsWr8xVPEeeMzp7YIeMZtw" target="_QsWslBVPEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUMxVhEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QNbI0BV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNBVhEeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aeMUNRVhEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QN6RABV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aeMUNhVhEeeMzp7YIeMZtw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_aeMUMRVhEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_aeJQ4BVhEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aeMUMhVhEeeMzp7YIeMZtw" points="[843, 524, -643984, -643984]$[1024, 524, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoBVhEeeMzp7YIeMZtw" id="(0.9955947136563876,0.51)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_afLLoRVhEeeMzp7YIeMZtw" id="(0.0,0.37037037037037035)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_8dGJABVpEeeMzp7YIeMZtw" type="Association_Edge" source="_QsWslBVPEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJAxVpEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QK6AUBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBBVpEeeMzp7YIeMZtw" x="-2" y="-17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBRVpEeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QLVeIBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJBhVpEeeMzp7YIeMZtw" x="1" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJBxVpEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QL3poBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJCBVpEeeMzp7YIeMZtw" x="216" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCRVpEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMQrMBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJChVpEeeMzp7YIeMZtw" x="-216" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJCxVpEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QMmpcBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDBVpEeeMzp7YIeMZtw" x="214" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8dGJDRVpEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QM8AoBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8dGJDhVpEeeMzp7YIeMZtw" x="-215" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_8dGJARVpEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_8clysBVpEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8dGJAhVpEeeMzp7YIeMZtw" points="[1083, 449, -643984, -643984]$[1357, 213, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QBVpEeeMzp7YIeMZtw" id="(0.3575757575757576,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8dl4QRVpEeeMzp7YIeMZtw" id="(0.0,0.4827586206896552)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_IM27wBVqEeeMzp7YIeMZtw" type="Association_Edge" source="_0EXCoBVMEeeMzp7YIeMZtw" target="_o3hKMBVhEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8BVqEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeN18BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8RVqEeeMzp7YIeMZtw" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w8hVqEeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JeuMQBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w8xVqEeeMzp7YIeMZtw" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9BVqEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Je-q8BVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9RVqEeeMzp7YIeMZtw" x="56" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w9hVqEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfN7gBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w9xVqEeeMzp7YIeMZtw" x="-56" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-BVqEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_JfdMEBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-RVqEeeMzp7YIeMZtw" x="56" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IM4w-hVqEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Jf1mkBVqEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IM4w-xVqEeeMzp7YIeMZtw" x="-56" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_IM27wRVqEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_IMUJMBVqEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IM27whVqEeeMzp7YIeMZtw" points="[1735, 454, -643984, -643984]$[1512, 209, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgBVqEeeMzp7YIeMZtw" id="(0.3652694610778443,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_INbjgRVqEeeMzp7YIeMZtw" id="(1.0,0.42528735632183906)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_CBI5ABVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_15nGgRVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppUHoBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMRVtEeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_CBKuMhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ppqF4BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_CBKuMxVtEeeMzp7YIeMZtw" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_CBI5ARVtEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_CBHq4BVtEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CBI5AhVtEeeMzp7YIeMZtw" points="[1924, 843, -643984, -643984]$[1890, 792, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xUBVtEeeMzp7YIeMZtw" id="(0.30985915492957744,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CB8xURVtEeeMzp7YIeMZtw" id="(0.5434782608695652,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_PdCdcBVtEeeMzp7YIeMZtw" type="Dependency_Edge" source="_wWO9gBVsEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkBVtEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pp7ysBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkRVtEeeMzp7YIeMZtw" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_PdDrkhVtEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_pqPUsBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_PdDrkxVtEeeMzp7YIeMZtw" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_PdCdcRVtEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_Pc_aIBVtEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PdCdchVtEeeMzp7YIeMZtw" points="[1789, 843, -643984, -643984]$[1815, 792, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8BVtEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PduZ8RVtEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_RM6qMBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_TQvYkBVtEeeMzp7YIeMZtw" target="_T_A7MBVqEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQBVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mTnXIBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQRVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RQhVuEeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUBm0BVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RQxVuEeeMzp7YIeMZtw" x="-2" y="17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRBVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUTToBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RRhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mUjLQBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RRxVuEeeMzp7YIeMZtw" x="-5" y="12"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RSBVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mU04EBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSRVuEeeMzp7YIeMZtw" x="20" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RM7RShVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_mVMEcBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RM7RSxVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_RM6qMRVuEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_RMhooBVuEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RM6qMhVuEeeMzp7YIeMZtw" points="[2076, 810, -643984, -643984]$[1953, 739, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkBVuEeeMzp7YIeMZtw" id="(0.0,0.7087378640776699)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RNlYkRVuEeeMzp7YIeMZtw" id="(1.0,0.5225225225225225)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_trQ6JhVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trRhaxVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6JxVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6KRVuEeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trQ6KhVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trQ6KxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trQ6LBVuEeeMzp7YIeMZtw" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_trQ6LRVuEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_trPsABVuEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trQ6LhVuEeeMzp7YIeMZtw" points="[2289, 766, -643984, -643984]$[2255, 715, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6LxVuEeeMzp7YIeMZtw" id="(0.305,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trQ6MBVuEeeMzp7YIeMZtw" id="(0.5408163265306123,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_trRhMBVuEeeMzp7YIeMZtw" type="Dependency_Edge" source="_trQ6MRVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhMRVuEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhMhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhMxVuEeeMzp7YIeMZtw" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhNBVuEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhNRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhNhVuEeeMzp7YIeMZtw" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_trRhNxVuEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_trQTFBVuEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhOBVuEeeMzp7YIeMZtw" points="[2154, 766, -643984, -643984]$[2180, 715, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhORVuEeeMzp7YIeMZtw" id="(0.765625,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhOhVuEeeMzp7YIeMZtw" id="(0.2753623188405797,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_trRhVBVuEeeMzp7YIeMZtw" type="Association_Edge" source="_trRhhBVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhVRVuEeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhVhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhVxVuEeeMzp7YIeMZtw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWBVuEeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhWRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhWhVuEeeMzp7YIeMZtw" x="-2" y="17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhWxVuEeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXBVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhXRVuEeeMzp7YIeMZtw" x="117" y="-63"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhXhVuEeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhXxVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYBVuEeeMzp7YIeMZtw" x="-5" y="12"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhYRVuEeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhYhVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhYxVuEeeMzp7YIeMZtw" x="20" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_trRhZBVuEeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_trRhZRVuEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_trRhZhVuEeeMzp7YIeMZtw" x="-21" y="-19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_trRhZxVuEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_trQ6IBVuEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_trRhaBVuEeeMzp7YIeMZtw" points="[2174, 573, -643984, -643984]$[2051, 502, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhaRVuEeeMzp7YIeMZtw" id="(0.8888888888888888,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_trRhahVuEeeMzp7YIeMZtw" id="(0.389937106918239,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_BMxx8RVvEeeMzp7YIeMZtw" type="Dependency_Edge" source="_7uQ60BVuEeeMzp7YIeMZtw" target="_trRhOxVuEeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9BVvEeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HxRkQBVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9RVvEeeMzp7YIeMZtw" x="1" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_BMxx9hVvEeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Hx-u4BVwEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_BMxx9xVvEeeMzp7YIeMZtw" x="1" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_BMxx8hVvEeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_BMxx8BVvEeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BMxx8xVvEeeMzp7YIeMZtw" points="[1968, 789, -643984, -643984]$[2245, 718, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4BVvEeeMzp7YIeMZtw" id="(0.993421052631579,0.61)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BNrw4RVvEeeMzp7YIeMZtw" id="(0.0,0.5855855855855856)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSDRV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHlBV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSDhV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSDxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSEBV-EeeMzp7YIeMZtw" y="39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSERV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSEhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSExV-EeeMzp7YIeMZtw" x="-1" y="58"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSFBV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_QxRcwBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSFRV-EeeMzp7YIeMZtw" points="[519, 1169, -643984, -643984]$[519, 1092, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFhV-EeeMzp7YIeMZtw" id="(0.44370860927152317,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSFxV-EeeMzp7YIeMZtw" id="(0.19285714285714287,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSGBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxTSIRV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSGhV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSGxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSHBV-EeeMzp7YIeMZtw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSHRV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_QxPAhxV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSHhV-EeeMzp7YIeMZtw" points="[291, 907, -643984, -643984]$[290, 985, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSHxV-EeeMzp7YIeMZtw" id="(0.7440476190476191,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSIBV-EeeMzp7YIeMZtw" id="(0.6115107913669064,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSOhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxT5TxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSOxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPBV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSPRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSPhV-EeeMzp7YIeMZtw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSPxV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_QxPnkxV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSQBV-EeeMzp7YIeMZtw" points="[253, 393, -643984, -643984]$[368, 308, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQRV-EeeMzp7YIeMZtw" id="(0.49489795918367346,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSQhV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSdRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5HhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSdhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSdxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSeBV-EeeMzp7YIeMZtw" y="39"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSeRV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxSD3BV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSehV-EeeMzp7YIeMZtw" points="[427, 677, -643984, -643984]$[352, 566, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSexV-EeeMzp7YIeMZtw" id="(0.1111111111111111,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSfBV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSfRV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSfhV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSfxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgBV-EeeMzp7YIeMZtw" y="-19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSgRV-EeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSghV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSgxV-EeeMzp7YIeMZtw" x="-1" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShBV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTShRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTShhV-EeeMzp7YIeMZtw" x="51" y="-19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTShxV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSiBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSiRV-EeeMzp7YIeMZtw" x="-52" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSihV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSixV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjBV-EeeMzp7YIeMZtw" x="51" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSjRV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSjhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSjxV-EeeMzp7YIeMZtw" x="-52" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSkBV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_QxOZdBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSkRV-EeeMzp7YIeMZtw" points="[903, 338, -643984, -643984]$[572, 230, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkhV-EeeMzp7YIeMZtw" id="(0.0,0.35)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSkxV-EeeMzp7YIeMZtw" id="(1.0,0.7425742574257426)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSlBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxT5ahV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSlRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSlhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSlxV-EeeMzp7YIeMZtw" x="1" y="38"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSmBV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxQOsBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSmRV-EeeMzp7YIeMZtw" points="[1424, 636, -643984, -643984]$[1515, 572, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmhV-EeeMzp7YIeMZtw" id="(0.5982142857142857,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSmxV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxTSnBV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxT5gRV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSnRV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSnhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSnxV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSoRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSohV-EeeMzp7YIeMZtw" x="-2" y="17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSoxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSpRV-EeeMzp7YIeMZtw" x="44" y="-19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSphV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSpxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqBV-EeeMzp7YIeMZtw" x="-43" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSqRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSqhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSqxV-EeeMzp7YIeMZtw" x="44" y="18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxTSrBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxTSrRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxTSrhV-EeeMzp7YIeMZtw" x="-43" y="-19"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxTSrxV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_QxSD5hV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxTSsBV-EeeMzp7YIeMZtw" points="[862, 51, -643984, -643984]$[572, 58, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSsRV-EeeMzp7YIeMZtw" id="(0.0,0.1683673469387755)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxTSshV-EeeMzp7YIeMZtw" id="(1.0,0.17491749174917492)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxT5ABV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSQxV-EeeMzp7YIeMZtw" target="_QxT5gRV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ARV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5AhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5AxV-EeeMzp7YIeMZtw" x="1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BBV-EeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5BRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5BhV-EeeMzp7YIeMZtw" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5BxV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5CRV-EeeMzp7YIeMZtw" x="15" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5ChV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5CxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DBV-EeeMzp7YIeMZtw" x="-15" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5DRV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5DhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5DxV-EeeMzp7YIeMZtw" x="15" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5EBV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5ERV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5EhV-EeeMzp7YIeMZtw" x="-15" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5ExV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_QxOZeBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5FBV-EeeMzp7YIeMZtw" points="[935, 317, -643984, -643984]$[928, 214, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FRV-EeeMzp7YIeMZtw" id="(0.23958333333333334,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5FhV-EeeMzp7YIeMZtw" id="(0.3173076923076923,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxT5FxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgnhV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5GBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5GRV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5GhV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxQOpBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5GxV-EeeMzp7YIeMZtw" points="[213, 650, -643984, -643984]$[217, 566, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HBV-EeeMzp7YIeMZtw" id="(0.27976190476190477,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5HRV-EeeMzp7YIeMZtw" id="(0.3112244897959184,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxT5RxV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHYRV-EeeMzp7YIeMZtw" target="_QxT5TxV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5SBV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxT5SRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5ShV-EeeMzp7YIeMZtw" y="39"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5SxV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1uRV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5TBV-EeeMzp7YIeMZtw" points="[104, 683, -643984, -643984]$[156, 566, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5TRV-EeeMzp7YIeMZtw" id="(0.6101694915254238,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5ThV-EeeMzp7YIeMZtw" id="(0.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxT5tRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxUgZBV-EeeMzp7YIeMZtw" target="_QxSq4xV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxT5thV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxT5txV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxT5uBV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxSD1BV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxT5uRV-EeeMzp7YIeMZtw" points="[717, 673, -643984, -643984]$[717, 564, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxT5uhV-EeeMzp7YIeMZtw" id="(0.2236024844720497,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgEBV-EeeMzp7YIeMZtw" id="(0.3220338983050847,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxUgPhV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxSq4xV-EeeMzp7YIeMZtw" target="_QxUgERV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgPxV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQBV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxUgQRV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxUgQhV-EeeMzp7YIeMZtw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxUgQxV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_QxPnlBV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxUgRBV-EeeMzp7YIeMZtw" points="[660, 412, -643984, -643984]$[572, 308, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRRV-EeeMzp7YIeMZtw" id="(0.0,0.13636363636363635)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxUgRhV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxVHIBV-EeeMzp7YIeMZtw" type="Dependency_Edge" source="_QxVHsRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIRV-EeeMzp7YIeMZtw" type="Dependency_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L2DOABWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHIhV-EeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHIxV-EeeMzp7YIeMZtw" type="Dependency_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_L3NEkBWAEeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHJBV-EeeMzp7YIeMZtw" x="-1" y="57"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHJRV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Dependency" href="model.uml#_QxOZcxV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHJhV-EeeMzp7YIeMZtw" points="[716, 1196, -643984, -643984]$[632, 1108, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHJxV-EeeMzp7YIeMZtw" id="(0.3553921568627451,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHKBV-EeeMzp7YIeMZtw" id="(0.65,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxVHKRV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVuSxV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHKhV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHKxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHLBV-EeeMzp7YIeMZtw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHLRV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxPnlhV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHLhV-EeeMzp7YIeMZtw" points="[1589, 633, -643984, -643984]$[1589, 572, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHLxV-EeeMzp7YIeMZtw" id="(0.19895287958115182,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHMBV-EeeMzp7YIeMZtw" id="(0.30833333333333335,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxVHShV-EeeMzp7YIeMZtw" type="Association_Edge" source="_QxTSIRV-EeeMzp7YIeMZtw" target="_QxTR8BV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHSxV-EeeMzp7YIeMZtw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHTRV-EeeMzp7YIeMZtw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHThV-EeeMzp7YIeMZtw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHTxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUBV-EeeMzp7YIeMZtw" x="1" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHURV-EeeMzp7YIeMZtw" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHUhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHUxV-EeeMzp7YIeMZtw" x="33" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVBV-EeeMzp7YIeMZtw" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHVRV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHVhV-EeeMzp7YIeMZtw" x="-97" y="17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHVxV-EeeMzp7YIeMZtw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWBV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHWRV-EeeMzp7YIeMZtw" x="35" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHWhV-EeeMzp7YIeMZtw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHWxV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHXBV-EeeMzp7YIeMZtw" x="-13" y="3"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxVHXRV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Association" href="model.uml#_QxRcwRV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVHXhV-EeeMzp7YIeMZtw" points="[334, 1039, -643984, -643984]$[539, 1024, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHXxV-EeeMzp7YIeMZtw" id="(1.0,0.4298850574712644)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVHYBV-EeeMzp7YIeMZtw" id="(0.0,0.3511450381679389)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_QxVHzBV-EeeMzp7YIeMZtw" type="Generalization_Edge" source="_QxVHMRV-EeeMzp7YIeMZtw" target="_QxTSXBV-EeeMzp7YIeMZtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QxVHzRV-EeeMzp7YIeMZtw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QxVHzhV-EeeMzp7YIeMZtw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QxVHzxV-EeeMzp7YIeMZtw" x="-1" y="38"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_QxVH0BV-EeeMzp7YIeMZtw"/>
+    <element xmi:type="uml:Generalization" href="model.uml#_QxQ1sxV-EeeMzp7YIeMZtw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxVH0RV-EeeMzp7YIeMZtw" points="[1686, 645, -643984, -643984]$[1601, 581, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0hV-EeeMzp7YIeMZtw" id="(0.1242603550295858,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QxVH0xV-EeeMzp7YIeMZtw" id="(1.0,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/src/model.uml b/src/model.uml
index 2dd5385..7ceb247 100644
--- a/src/model.uml
+++ b/src/model.uml
@@ -1,377 +1,377 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_oX-IkBPOEeeugOD0sSUlEg" name="RootElement">
-  <packagedElement xmi:type="uml:Class" xmi:id="_tdw-kBVLEeeMzp7YIeMZtw" name="Starters">
-    <generalization xmi:type="uml:Generalization" xmi:id="_d28IwBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_3Heq0BVLEeeMzp7YIeMZtw" name="MainDishes">
-    <generalization xmi:type="uml:Generalization" xmi:id="_g-wOQBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_7yg2kBVLEeeMzp7YIeMZtw" name="Desserts">
-    <generalization xmi:type="uml:Generalization" xmi:id="_iN5h8BVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_0EEHsBVMEeeMzp7YIeMZtw" name="Dishe">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_-UmjYBVMEeeMzp7YIeMZtw" name="Name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_FrEaoBVNEeeMzp7YIeMZtw" name="Price" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_OAX74BVREeeMzp7YIeMZtw" name="disheType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_IMVXUhVqEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_4sOJIBVNEeeMzp7YIeMZtw" name="FactoryDishe">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_GnP5kBVOEeeMzp7YIeMZtw" name="dishes" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_5QxLMBVOEeeMzp7YIeMZtw" name="createDishes">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Cxjk8BVPEeeMzp7YIeMZtw" name="dishName">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedParameter>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_9zOfMBVNEeeMzp7YIeMZtw" name="Item"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_AhSn8BVOEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Association" xmi:id="_GXLdQBVOEeeMzp7YIeMZtw" memberEnd="_GnP5kBVOEeeMzp7YIeMZtw _GnZDgBVOEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GXLdQRVOEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GXLdQhVOEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_GnZDgBVOEeeMzp7YIeMZtw" name="factorydishes" type="_4sOJIBVNEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4RVPEeeMzp7YIeMZtw" name="FullMeal">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr4hVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4xVPEeeMzp7YIeMZtw" name="HalfMeal">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr5BVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7BVPEeeMzp7YIeMZtw" name="Meal">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QsWr7RVPEeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBh5oBVQEeeMzp7YIeMZtw" name="meal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bQOoYBVREeeMzp7YIeMZtw" name="mealType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8co2AhVpEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_uKTFsBVREeeMzp7YIeMZtw" name="accept"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7xVPEeeMzp7YIeMZtw" name="MealFactory">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QsWr8RVPEeeMzp7YIeMZtw" name="createMeal">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QsWr8hVPEeeMzp7YIeMZtw" name="dishName">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedParameter>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_jbedcBVPEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_D3KFoBVQEeeMzp7YIeMZtw" name="ArrayList"/>
-  <packagedElement xmi:type="uml:Enumeration" xmi:id="_-j608BVQEeeMzp7YIeMZtw" name="ItemType">
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CVrPUBVREeeMzp7YIeMZtw" name="Standard"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_FD5JEBVREeeMzp7YIeMZtw" name="Vegetarian"/>
-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GTVXsBVREeeMzp7YIeMZtw" name="GlutenFree"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_31XnYBVSEeeMzp7YIeMZtw" name="Visitor"/>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_6gYcIBVSEeeMzp7YIeMZtw" name="Visitable">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_ESR0ABVTEeeMzp7YIeMZtw" name="accept">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Qc4vsBVTEeeMzp7YIeMZtw" name="visitor" type="_31XnYBVSEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_YEh2gBVTEeeMzp7YIeMZtw" client="_QsWr7BVPEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_a_MQ0BVTEeeMzp7YIeMZtw" client="_0EEHsBVMEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_qOaNABVTEeeMzp7YIeMZtw" name="Order">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hwhkQBVfEeeMzp7YIeMZtw" name="listMeal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_xVpCgBVgEeeMzp7YIeMZtw" name="listDishes" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_tsxKQBVTEeeMzp7YIeMZtw" client="_qOaNABVTEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_aeJQ4BVhEeeMzp7YIeMZtw" client="_QsWr7xVPEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_o3bDkBVhEeeMzp7YIeMZtw" name="OrderVisitor">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_xDYYYBVhEeeMzp7YIeMZtw" name="visit">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_4635EBVhEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_5_YDABVhEeeMzp7YIeMZtw" name="visit">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_-mbGoBVhEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw"/>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_8clysBVpEeeMzp7YIeMZtw" memberEnd="_8co2AhVpEeeMzp7YIeMZtw _8co2AxVpEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8co2ABVpEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8co2ARVpEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_8co2AxVpEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_IMUJMBVqEeeMzp7YIeMZtw" memberEnd="_IMVXUhVqEeeMzp7YIeMZtw _IMVXUxVqEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IMVXUBVqEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IMVXURVqEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_IMVXUxVqEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_T-934BVqEeeMzp7YIeMZtw" name="StrategyDeliveryPolicy">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_aBVC8BVqEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_wWBiIBVsEeeMzp7YIeMZtw" name="FastestDelivery">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_zWDkoBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_15nGgBVsEeeMzp7YIeMZtw" name="FairOccupationDelivery">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_6gpjEBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_CBHq4BVtEeeMzp7YIeMZtw" client="_15nGgBVsEeeMzp7YIeMZtw" supplier="_T-934BVqEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_Pc_aIBVtEeeMzp7YIeMZtw" client="_wWBiIBVsEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_TQsVQBVtEeeMzp7YIeMZtw" name="ContextDeliveryPolicy">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Fl5jwBVuEeeMzp7YIeMZtw" name="strategyDeliveryPolicy" visibility="private" type="_T-934BVqEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_RMiPshVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_T-934BVqEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_BXlJMBVuEeeMzp7YIeMZtw" name="execute"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_RMhooBVuEeeMzp7YIeMZtw" memberEnd="_RMiPshVuEeeMzp7YIeMZtw _RMiPsxVuEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RMiPsBVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RMiPsRVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_RMiPsxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_TQsVQBVtEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_trPsABVuEeeMzp7YIeMZtw" client="_trQTFRVuEeeMzp7YIeMZtw" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQTEBVuEeeMzp7YIeMZtw" name="ContextTargetProfit">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTERVuEeeMzp7YIeMZtw" name="strategyTargetProfit" visibility="private" type="_trQTFxVuEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTEhVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_trQTFxVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTExVuEeeMzp7YIeMZtw" name="execute"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_trQTFBVuEeeMzp7YIeMZtw" client="_trQ6JBVuEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQTFRVuEeeMzp7YIeMZtw" name="TargetProfitMarkup">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTFhVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_trQTFxVuEeeMzp7YIeMZtw" name="StrategyTargetProfitPolicy">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTGBVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_trQ6IBVuEeeMzp7YIeMZtw" memberEnd="_trQTEhVuEeeMzp7YIeMZtw _trQ6IxVuEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_trQ6IRVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_trQ6IhVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_trQ6IxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_trQTEBVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_trQ6JBVuEeeMzp7YIeMZtw" name="TargetProfitServiceFee">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQ6JRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_7uPssBVuEeeMzp7YIeMZtw" name="TargetProfitDeliveryCost">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_7uPssRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_BMxx8BVvEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_OgNIIBV1EeeMzp7YIeMZtw" name="MyFoodora">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBA8cBV1EeeMzp7YIeMZtw" name="serviceFee" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Ve1uMBV1EeeMzp7YIeMZtw" name="markupPercentage" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_afrK0BV1EeeMzp7YIeMZtw" name="deliveryCost" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hKSosBV1EeeMzp7YIeMZtw" name="listRestaurant" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hkFowBV1EeeMzp7YIeMZtw" name="listCustomer" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_hk8kYBV1EeeMzp7YIeMZtw" name="listCourier" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_uvbosBV1EeeMzp7YIeMZtw" name="listManager" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_1lKKYBV1EeeMzp7YIeMZtw" name="targetProfitPolicy" visibility="private" type="_trQTEBVuEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_AQ-M0BV2EeeMzp7YIeMZtw" name="deliveryPolicy" visibility="private" type="_TQsVQBVtEeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_JFxqUBV2EeeMzp7YIeMZtw" name="specialOffer" visibility="private"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_auaU8BV2EeeMzp7YIeMZtw" name="Operation1"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxOZcxV-EeeMzp7YIeMZtw" client="_QxSD0BV-EeeMzp7YIeMZtw" supplier="_QxRcxRV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZdBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmxV-EeeMzp7YIeMZtw _QxOZdxV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZdRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZdhV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZdxV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZeBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmhV-EeeMzp7YIeMZtw _QxOZexV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZeRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZehV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZexV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAgBV-EeeMzp7YIeMZtw" name="MealOfTheWeek">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgRV-EeeMzp7YIeMZtw" name="state" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAghV-EeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgxV-EeeMzp7YIeMZtw" name="Meal" visibility="private"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAhBV-EeeMzp7YIeMZtw" name="HumanUser" isAbstract="true">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhRV-EeeMzp7YIeMZtw" name="birthDate">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhhV-EeeMzp7YIeMZtw" name="surname">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPAhxV-EeeMzp7YIeMZtw" client="_QxQOoxV-EeeMzp7YIeMZtw" supplier="_QxPnkBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAiBV-EeeMzp7YIeMZtw" name="User" visibility="public" isAbstract="true">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAiRV-EeeMzp7YIeMZtw" name="id" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAihV-EeeMzp7YIeMZtw" name="name" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAixV-EeeMzp7YIeMZtw" name="username" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjBV-EeeMzp7YIeMZtw" name="password" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjRV-EeeMzp7YIeMZtw" name="adress" visibility="private" type="_QxQOoBV-EeeMzp7YIeMZtw" isUnique="false"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjhV-EeeMzp7YIeMZtw" name="mail" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjxV-EeeMzp7YIeMZtw" name="phoneNumber" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAkBV-EeeMzp7YIeMZtw" name="activated" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPAkRV-EeeMzp7YIeMZtw" name="register"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_QxPnkBV-EeeMzp7YIeMZtw" name="Observer">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnkRV-EeeMzp7YIeMZtw" name="oservableoffer" type="_QxRcxRV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPnkhV-EeeMzp7YIeMZtw" name="update"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnkxV-EeeMzp7YIeMZtw" client="_QxPAhBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnlBV-EeeMzp7YIeMZtw" client="_QxQ1sBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnlRV-EeeMzp7YIeMZtw" name="PointFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxPnlhV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnlxV-EeeMzp7YIeMZtw" name="numberOfPoints">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnmBV-EeeMzp7YIeMZtw" name="MyFoodoraSystem">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmRV-EeeMzp7YIeMZtw" name="prodFactory" visibility="private" type="_QxSq4BV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmhV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoBV-EeeMzp7YIeMZtw" name="Adress">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOoRV-EeeMzp7YIeMZtw" name="x" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOohV-EeeMzp7YIeMZtw" name="y" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoxV-EeeMzp7YIeMZtw" name="Customer">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOpBV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpRV-EeeMzp7YIeMZtw" name="spamAgree" aggregation="composite">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOphV-EeeMzp7YIeMZtw" name="historique"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpxV-EeeMzp7YIeMZtw" name="card" type="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqBV-EeeMzp7YIeMZtw" name="placeOrder"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqRV-EeeMzp7YIeMZtw" name="registerFidelityPlan"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqhV-EeeMzp7YIeMZtw" name="unregisterFidelityPlan"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqxV-EeeMzp7YIeMZtw" name="getHistoryOfOrders"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrBV-EeeMzp7YIeMZtw" name="getPointsInTheCard"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrRV-EeeMzp7YIeMZtw" name="acceptSpam"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrhV-EeeMzp7YIeMZtw" name="refuseSpam"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOrxV-EeeMzp7YIeMZtw" name="BasicFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOsBV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOsRV-EeeMzp7YIeMZtw" name="Date">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOshV-EeeMzp7YIeMZtw" name="year" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOsxV-EeeMzp7YIeMZtw" name="month" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOtBV-EeeMzp7YIeMZtw" name="day" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOtRV-EeeMzp7YIeMZtw" name="FidelityCard">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOthV-EeeMzp7YIeMZtw" name="ID">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1sBV-EeeMzp7YIeMZtw" name="MoralUser" isAbstract="true"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1shV-EeeMzp7YIeMZtw" name="LotteryFidelityCard">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1sxV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1tBV-EeeMzp7YIeMZtw" name="percentage" isReadOnly="true">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1tRV-EeeMzp7YIeMZtw" name="Position">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1thV-EeeMzp7YIeMZtw" name="x" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1txV-EeeMzp7YIeMZtw" name="y" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1uBV-EeeMzp7YIeMZtw" name="Manager">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1uRV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1uhV-EeeMzp7YIeMZtw" name="addUser">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1uxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vBV-EeeMzp7YIeMZtw" name="removeUser">
-      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1vRV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
-    </ownedOperation>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vhV-EeeMzp7YIeMZtw" name="changeServiceFee"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vxV-EeeMzp7YIeMZtw" name="changeMarkupPercentage"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wBV-EeeMzp7YIeMZtw" name="changeDeliveryCost"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wRV-EeeMzp7YIeMZtw" name="getTotalIncome"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1whV-EeeMzp7YIeMZtw" name="getProfit"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wxV-EeeMzp7YIeMZtw" name="getAverageIncome"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xBV-EeeMzp7YIeMZtw" name="getAverageProfit"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xRV-EeeMzp7YIeMZtw" name="getAverageIncomePerCustomer"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xhV-EeeMzp7YIeMZtw" name="setTargetProfitPolicy"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xxV-EeeMzp7YIeMZtw" name="getMostsellingRestaurant"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yBV-EeeMzp7YIeMZtw" name="getLeastSellingRestaurant"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yRV-EeeMzp7YIeMZtw" name="setDeliveryPolicy"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxRcwBV-EeeMzp7YIeMZtw" client="_QxPAgBV-EeeMzp7YIeMZtw">
-    <supplier xmi:type="uml:Model" href="file:/B:/Mes%20Documents/progra/java/software/td/my.foodora/FoodoraUml/model.uml#__GX94BP0EeeyD81rpgqPUg"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxRcwRV-EeeMzp7YIeMZtw" memberEnd="_QxPnkRV-EeeMzp7YIeMZtw _QxRcxBV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxRcwhV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxRcwxV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxRcxBV-EeeMzp7YIeMZtw" name="observer" type="_QxPnkBV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_QxRcxRV-EeeMzp7YIeMZtw" name="OservableOffer">
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxhV-EeeMzp7YIeMZtw" name="attachObserver"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxxV-EeeMzp7YIeMZtw" name="detachObserver"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcyBV-EeeMzp7YIeMZtw" name="notify"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0BV-EeeMzp7YIeMZtw" name="BirthdayOffer">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD0RV-EeeMzp7YIeMZtw" name="state" visibility="private"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0xV-EeeMzp7YIeMZtw" name="Restaurant">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD1BV-EeeMzp7YIeMZtw" general="_QxQ1sBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD1RV-EeeMzp7YIeMZtw" name="listOfMeal"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1hV-EeeMzp7YIeMZtw" name="addItem"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1xV-EeeMzp7YIeMZtw" name="removeItem"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2BV-EeeMzp7YIeMZtw" name="setGenericDiscountFactor"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2RV-EeeMzp7YIeMZtw" name="setSpecialDiscountFactor"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2hV-EeeMzp7YIeMZtw" name="sortOrders"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD2xV-EeeMzp7YIeMZtw" name="Courier">
-    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD3BV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3RV-EeeMzp7YIeMZtw" name="position" type="_QxQ1tRV-EeeMzp7YIeMZtw"/>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3hV-EeeMzp7YIeMZtw" name="numberOfLivraison">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3xV-EeeMzp7YIeMZtw" name="available">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4BV-EeeMzp7YIeMZtw" name="register"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4RV-EeeMzp7YIeMZtw" name="unregister"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4hV-EeeMzp7YIeMZtw" name="setAvailability"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4xV-EeeMzp7YIeMZtw" name="changePosition"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5BV-EeeMzp7YIeMZtw" name="acceptDelivery"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5RV-EeeMzp7YIeMZtw" name="refuseDelivery"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_QxSD5hV-EeeMzp7YIeMZtw" memberEnd="_QxSq4RV-EeeMzp7YIeMZtw _QxSD6RV-EeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxSD5xV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxSD6BV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
-    </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_QxSD6RV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_QxSq4BV-EeeMzp7YIeMZtw" name="UserFactory">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSq4RV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSq4hV-EeeMzp7YIeMZtw" name="createUser"/>
-  </packagedElement>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_tczxwBVKEeeMzp7YIeMZtw">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tczxwRVKEeeMzp7YIeMZtw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-  </profileApplication>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_oX-IkBPOEeeugOD0sSUlEg" name="RootElement">
+  <packagedElement xmi:type="uml:Class" xmi:id="_tdw-kBVLEeeMzp7YIeMZtw" name="Starters">
+    <generalization xmi:type="uml:Generalization" xmi:id="_d28IwBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_3Heq0BVLEeeMzp7YIeMZtw" name="MainDishes">
+    <generalization xmi:type="uml:Generalization" xmi:id="_g-wOQBVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7yg2kBVLEeeMzp7YIeMZtw" name="Desserts">
+    <generalization xmi:type="uml:Generalization" xmi:id="_iN5h8BVNEeeMzp7YIeMZtw" general="_0EEHsBVMEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_0EEHsBVMEeeMzp7YIeMZtw" name="Dishe">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_-UmjYBVMEeeMzp7YIeMZtw" name="Name" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_FrEaoBVNEeeMzp7YIeMZtw" name="Price" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_OAX74BVREeeMzp7YIeMZtw" name="disheType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_IMVXUhVqEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_4sOJIBVNEeeMzp7YIeMZtw" name="FactoryDishe">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_GnP5kBVOEeeMzp7YIeMZtw" name="dishes" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_5QxLMBVOEeeMzp7YIeMZtw" name="createDishes">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Cxjk8BVPEeeMzp7YIeMZtw" name="dishName">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+      </ownedParameter>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_9zOfMBVNEeeMzp7YIeMZtw" name="Item"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_AhSn8BVOEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_GXLdQBVOEeeMzp7YIeMZtw" memberEnd="_GnP5kBVOEeeMzp7YIeMZtw _GnZDgBVOEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GXLdQRVOEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GXLdQhVOEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_GnZDgBVOEeeMzp7YIeMZtw" name="factorydishes" type="_4sOJIBVNEeeMzp7YIeMZtw" association="_GXLdQBVOEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4RVPEeeMzp7YIeMZtw" name="FullMeal">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr4hVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr4xVPEeeMzp7YIeMZtw" name="HalfMeal">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QsWr5BVPEeeMzp7YIeMZtw" general="_QsWr7BVPEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7BVPEeeMzp7YIeMZtw" name="Meal">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QsWr7RVPEeeMzp7YIeMZtw" name="name" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBh5oBVQEeeMzp7YIeMZtw" name="meal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw" isUnique="false"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bQOoYBVREeeMzp7YIeMZtw" name="mealType" visibility="private" type="_-j608BVQEeeMzp7YIeMZtw" isUnique="false"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8co2AhVpEeeMzp7YIeMZtw" name="ordervisitor" type="_o3bDkBVhEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_uKTFsBVREeeMzp7YIeMZtw" name="accept"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QsWr7xVPEeeMzp7YIeMZtw" name="MealFactory">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QsWr8RVPEeeMzp7YIeMZtw" name="createMeal">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QsWr8hVPEeeMzp7YIeMZtw" name="dishName">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+      </ownedParameter>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_jbedcBVPEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_9zOfMBVNEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_D3KFoBVQEeeMzp7YIeMZtw" name="ArrayList"/>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_-j608BVQEeeMzp7YIeMZtw" name="ItemType">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CVrPUBVREeeMzp7YIeMZtw" name="Standard"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_FD5JEBVREeeMzp7YIeMZtw" name="Vegetarian"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GTVXsBVREeeMzp7YIeMZtw" name="GlutenFree"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_31XnYBVSEeeMzp7YIeMZtw" name="Visitor"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_6gYcIBVSEeeMzp7YIeMZtw" name="Visitable">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_ESR0ABVTEeeMzp7YIeMZtw" name="accept">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_Qc4vsBVTEeeMzp7YIeMZtw" name="visitor" type="_31XnYBVSEeeMzp7YIeMZtw"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_YEh2gBVTEeeMzp7YIeMZtw" client="_QsWr7BVPEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_a_MQ0BVTEeeMzp7YIeMZtw" client="_0EEHsBVMEeeMzp7YIeMZtw" supplier="_6gYcIBVSEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_qOaNABVTEeeMzp7YIeMZtw" name="Order">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_hwhkQBVfEeeMzp7YIeMZtw" name="listMeal" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_xVpCgBVgEeeMzp7YIeMZtw" name="listDishes" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_tsxKQBVTEeeMzp7YIeMZtw" client="_qOaNABVTEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_aeJQ4BVhEeeMzp7YIeMZtw" client="_QsWr7xVPEeeMzp7YIeMZtw" supplier="_QsWr7BVPEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_o3bDkBVhEeeMzp7YIeMZtw" name="OrderVisitor">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_xDYYYBVhEeeMzp7YIeMZtw" name="visit">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_4635EBVhEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw"/>
+    </ownedOperation>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_5_YDABVhEeeMzp7YIeMZtw" name="visit">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_-mbGoBVhEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_8clysBVpEeeMzp7YIeMZtw" memberEnd="_8co2AhVpEeeMzp7YIeMZtw _8co2AxVpEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8co2ABVpEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8co2ARVpEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_8co2AxVpEeeMzp7YIeMZtw" name="meal" type="_QsWr7BVPEeeMzp7YIeMZtw" association="_8clysBVpEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_IMUJMBVqEeeMzp7YIeMZtw" memberEnd="_IMVXUhVqEeeMzp7YIeMZtw _IMVXUxVqEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IMVXUBVqEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IMVXURVqEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_IMVXUxVqEeeMzp7YIeMZtw" name="dishe" type="_0EEHsBVMEeeMzp7YIeMZtw" association="_IMUJMBVqEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_T-934BVqEeeMzp7YIeMZtw" name="StrategyDeliveryPolicy">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_aBVC8BVqEeeMzp7YIeMZtw" name="chooseCourier"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_wWBiIBVsEeeMzp7YIeMZtw" name="FastestDelivery">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_zWDkoBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_15nGgBVsEeeMzp7YIeMZtw" name="FairOccupationDelivery">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_6gpjEBVsEeeMzp7YIeMZtw" name="chooseCourier"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_CBHq4BVtEeeMzp7YIeMZtw" client="_15nGgBVsEeeMzp7YIeMZtw" supplier="_T-934BVqEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_Pc_aIBVtEeeMzp7YIeMZtw" client="_wWBiIBVsEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_TQsVQBVtEeeMzp7YIeMZtw" name="ContextDeliveryPolicy">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Fl5jwBVuEeeMzp7YIeMZtw" name="strategyDeliveryPolicy" visibility="private" type="_T-934BVqEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_RMiPshVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_T-934BVqEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_BXlJMBVuEeeMzp7YIeMZtw" name="execute"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_RMhooBVuEeeMzp7YIeMZtw" memberEnd="_RMiPshVuEeeMzp7YIeMZtw _RMiPsxVuEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RMiPsBVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RMiPsRVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_RMiPsxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_TQsVQBVtEeeMzp7YIeMZtw" association="_RMhooBVuEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_trPsABVuEeeMzp7YIeMZtw" client="_trQTFRVuEeeMzp7YIeMZtw" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_trQTEBVuEeeMzp7YIeMZtw" name="ContextTargetProfit">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTERVuEeeMzp7YIeMZtw" name="strategyTargetProfit" visibility="private" type="_trQTFxVuEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_trQTEhVuEeeMzp7YIeMZtw" name="strategydeliverypolicy" type="_trQTFxVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTExVuEeeMzp7YIeMZtw" name="execute"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_trQTFBVuEeeMzp7YIeMZtw" client="_trQ6JBVuEeeMzp7YIeMZtw" supplier="_oX-IkBPOEeeugOD0sSUlEg"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_trQTFRVuEeeMzp7YIeMZtw" name="TargetProfitMarkup">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTFhVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_trQTFxVuEeeMzp7YIeMZtw" name="StrategyTargetProfitPolicy">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQTGBVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_trQ6IBVuEeeMzp7YIeMZtw" memberEnd="_trQTEhVuEeeMzp7YIeMZtw _trQ6IxVuEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_trQ6IRVuEeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_trQ6IhVuEeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_trQ6IxVuEeeMzp7YIeMZtw" name="contextdeliverypolicy" type="_trQTEBVuEeeMzp7YIeMZtw" association="_trQ6IBVuEeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_trQ6JBVuEeeMzp7YIeMZtw" name="TargetProfitServiceFee">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_trQ6JRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7uPssBVuEeeMzp7YIeMZtw" name="TargetProfitDeliveryCost">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_7uPssRVuEeeMzp7YIeMZtw" name="chooseTragetProfit"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_BMxx8BVvEeeMzp7YIeMZtw" client="_oX-IkBPOEeeugOD0sSUlEg" supplier="_trQTFxVuEeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_OgNIIBV1EeeMzp7YIeMZtw" name="MyFoodora">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_SBA8cBV1EeeMzp7YIeMZtw" name="serviceFee" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Ve1uMBV1EeeMzp7YIeMZtw" name="markupPercentage" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_afrK0BV1EeeMzp7YIeMZtw" name="deliveryCost" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EFloat"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_hKSosBV1EeeMzp7YIeMZtw" name="listRestaurant" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_hkFowBV1EeeMzp7YIeMZtw" name="listCustomer" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_hk8kYBV1EeeMzp7YIeMZtw" name="listCourier" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_uvbosBV1EeeMzp7YIeMZtw" name="listManager" visibility="private" type="_D3KFoBVQEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_1lKKYBV1EeeMzp7YIeMZtw" name="targetProfitPolicy" visibility="private" type="_trQTEBVuEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_AQ-M0BV2EeeMzp7YIeMZtw" name="deliveryPolicy" visibility="private" type="_TQsVQBVtEeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JFxqUBV2EeeMzp7YIeMZtw" name="specialOffer" visibility="private"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_auaU8BV2EeeMzp7YIeMZtw" name="Operation1"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxOZcxV-EeeMzp7YIeMZtw" client="_QxSD0BV-EeeMzp7YIeMZtw" supplier="_QxRcxRV-EeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZdBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmxV-EeeMzp7YIeMZtw _QxOZdxV-EeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZdRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZdhV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZdxV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_QxOZeBV-EeeMzp7YIeMZtw" memberEnd="_QxPnmhV-EeeMzp7YIeMZtw _QxOZexV-EeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxOZeRV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxOZehV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_QxOZexV-EeeMzp7YIeMZtw" name="clientapplication" type="_QxPnmBV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAgBV-EeeMzp7YIeMZtw" name="MealOfTheWeek">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgRV-EeeMzp7YIeMZtw" name="state" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAghV-EeeMzp7YIeMZtw" name="name" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAgxV-EeeMzp7YIeMZtw" name="Meal" visibility="private"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAhBV-EeeMzp7YIeMZtw" name="HumanUser" isAbstract="true">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhRV-EeeMzp7YIeMZtw" name="birthDate">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAhhV-EeeMzp7YIeMZtw" name="surname">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPAhxV-EeeMzp7YIeMZtw" client="_QxQOoxV-EeeMzp7YIeMZtw" supplier="_QxPnkBV-EeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxPAiBV-EeeMzp7YIeMZtw" name="User" visibility="public" isAbstract="true">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAiRV-EeeMzp7YIeMZtw" name="id" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAihV-EeeMzp7YIeMZtw" name="name" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAixV-EeeMzp7YIeMZtw" name="username" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjBV-EeeMzp7YIeMZtw" name="password" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjRV-EeeMzp7YIeMZtw" name="adress" visibility="private" type="_QxQOoBV-EeeMzp7YIeMZtw" isUnique="false"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjhV-EeeMzp7YIeMZtw" name="mail" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAjxV-EeeMzp7YIeMZtw" name="phoneNumber" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPAkBV-EeeMzp7YIeMZtw" name="activated" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPAkRV-EeeMzp7YIeMZtw" name="register"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_QxPnkBV-EeeMzp7YIeMZtw" name="Observer">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnkRV-EeeMzp7YIeMZtw" name="oservableoffer" type="_QxRcxRV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxPnkhV-EeeMzp7YIeMZtw" name="update"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnkxV-EeeMzp7YIeMZtw" client="_QxPAhBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxPnlBV-EeeMzp7YIeMZtw" client="_QxQ1sBV-EeeMzp7YIeMZtw" supplier="_QxPAiBV-EeeMzp7YIeMZtw"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnlRV-EeeMzp7YIeMZtw" name="PointFidelityCard">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxPnlhV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnlxV-EeeMzp7YIeMZtw" name="numberOfPoints">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxPnmBV-EeeMzp7YIeMZtw" name="MyFoodoraSystem">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmRV-EeeMzp7YIeMZtw" name="prodFactory" visibility="private" type="_QxSq4BV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmhV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxOZeBV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxPnmxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxOZdBV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoBV-EeeMzp7YIeMZtw" name="Adress">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOoRV-EeeMzp7YIeMZtw" name="x" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOohV-EeeMzp7YIeMZtw" name="y" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOoxV-EeeMzp7YIeMZtw" name="Customer">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOpBV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpRV-EeeMzp7YIeMZtw" name="spamAgree" aggregation="composite">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOphV-EeeMzp7YIeMZtw" name="historique"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOpxV-EeeMzp7YIeMZtw" name="card" type="_QxQOtRV-EeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqBV-EeeMzp7YIeMZtw" name="placeOrder"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqRV-EeeMzp7YIeMZtw" name="registerFidelityPlan"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqhV-EeeMzp7YIeMZtw" name="unregisterFidelityPlan"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOqxV-EeeMzp7YIeMZtw" name="getHistoryOfOrders"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrBV-EeeMzp7YIeMZtw" name="getPointsInTheCard"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrRV-EeeMzp7YIeMZtw" name="acceptSpam"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQOrhV-EeeMzp7YIeMZtw" name="refuseSpam"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOrxV-EeeMzp7YIeMZtw" name="BasicFidelityCard">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxQOsBV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOsRV-EeeMzp7YIeMZtw" name="Date">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOshV-EeeMzp7YIeMZtw" name="year" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOsxV-EeeMzp7YIeMZtw" name="month" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOtBV-EeeMzp7YIeMZtw" name="day" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQOtRV-EeeMzp7YIeMZtw" name="FidelityCard">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQOthV-EeeMzp7YIeMZtw" name="ID">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1sBV-EeeMzp7YIeMZtw" name="MoralUser" isAbstract="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1shV-EeeMzp7YIeMZtw" name="LotteryFidelityCard">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1sxV-EeeMzp7YIeMZtw" general="_QxQOtRV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1tBV-EeeMzp7YIeMZtw" name="percentage" isReadOnly="true">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1tRV-EeeMzp7YIeMZtw" name="Position">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1thV-EeeMzp7YIeMZtw" name="x" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxQ1txV-EeeMzp7YIeMZtw" name="y" visibility="private">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxQ1uBV-EeeMzp7YIeMZtw" name="Manager">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxQ1uRV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1uhV-EeeMzp7YIeMZtw" name="addUser">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1uxV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
+    </ownedOperation>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vBV-EeeMzp7YIeMZtw" name="removeUser">
+      <ownedParameter xmi:type="uml:Parameter" xmi:id="_QxQ1vRV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw"/>
+    </ownedOperation>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vhV-EeeMzp7YIeMZtw" name="changeServiceFee"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1vxV-EeeMzp7YIeMZtw" name="changeMarkupPercentage"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wBV-EeeMzp7YIeMZtw" name="changeDeliveryCost"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wRV-EeeMzp7YIeMZtw" name="getTotalIncome"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1whV-EeeMzp7YIeMZtw" name="getProfit"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1wxV-EeeMzp7YIeMZtw" name="getAverageIncome"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xBV-EeeMzp7YIeMZtw" name="getAverageProfit"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xRV-EeeMzp7YIeMZtw" name="getAverageIncomePerCustomer"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xhV-EeeMzp7YIeMZtw" name="setTargetProfitPolicy"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1xxV-EeeMzp7YIeMZtw" name="getMostsellingRestaurant"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yBV-EeeMzp7YIeMZtw" name="getLeastSellingRestaurant"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxQ1yRV-EeeMzp7YIeMZtw" name="setDeliveryPolicy"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_QxRcwBV-EeeMzp7YIeMZtw" client="_QxPAgBV-EeeMzp7YIeMZtw">
+    <supplier xmi:type="uml:Model" href="file:/B:/Mes%20Documents/progra/java/software/td/my.foodora/FoodoraUml/model.uml#__GX94BP0EeeyD81rpgqPUg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_QxRcwRV-EeeMzp7YIeMZtw" memberEnd="_QxPnkRV-EeeMzp7YIeMZtw _QxRcxBV-EeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxRcwhV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxRcwxV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_QxRcxBV-EeeMzp7YIeMZtw" name="observer" type="_QxPnkBV-EeeMzp7YIeMZtw" association="_QxRcwRV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_QxRcxRV-EeeMzp7YIeMZtw" name="OservableOffer">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxhV-EeeMzp7YIeMZtw" name="attachObserver"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcxxV-EeeMzp7YIeMZtw" name="detachObserver"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxRcyBV-EeeMzp7YIeMZtw" name="notify"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0BV-EeeMzp7YIeMZtw" name="BirthdayOffer">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD0RV-EeeMzp7YIeMZtw" name="state" visibility="private"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD0xV-EeeMzp7YIeMZtw" name="Restaurant">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD1BV-EeeMzp7YIeMZtw" general="_QxQ1sBV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD1RV-EeeMzp7YIeMZtw" name="listOfMeal"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1hV-EeeMzp7YIeMZtw" name="addItem"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD1xV-EeeMzp7YIeMZtw" name="removeItem"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2BV-EeeMzp7YIeMZtw" name="setGenericDiscountFactor"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2RV-EeeMzp7YIeMZtw" name="setSpecialDiscountFactor"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD2hV-EeeMzp7YIeMZtw" name="sortOrders"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxSD2xV-EeeMzp7YIeMZtw" name="Courier">
+    <generalization xmi:type="uml:Generalization" xmi:id="_QxSD3BV-EeeMzp7YIeMZtw" general="_QxPAhBV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3RV-EeeMzp7YIeMZtw" name="position" type="_QxQ1tRV-EeeMzp7YIeMZtw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3hV-EeeMzp7YIeMZtw" name="numberOfLivraison">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSD3xV-EeeMzp7YIeMZtw" name="available">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4BV-EeeMzp7YIeMZtw" name="register"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4RV-EeeMzp7YIeMZtw" name="unregister"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4hV-EeeMzp7YIeMZtw" name="setAvailability"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD4xV-EeeMzp7YIeMZtw" name="changePosition"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5BV-EeeMzp7YIeMZtw" name="acceptDelivery"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSD5RV-EeeMzp7YIeMZtw" name="refuseDelivery"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_QxSD5hV-EeeMzp7YIeMZtw" memberEnd="_QxSq4RV-EeeMzp7YIeMZtw _QxSD6RV-EeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxSD5xV-EeeMzp7YIeMZtw" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxSD6BV-EeeMzp7YIeMZtw" key="nature" value="UML_Nature"/>
+    </eAnnotations>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_QxSD6RV-EeeMzp7YIeMZtw" name="userfactory" type="_QxSq4BV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_QxSq4BV-EeeMzp7YIeMZtw" name="UserFactory">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_QxSq4RV-EeeMzp7YIeMZtw" name="user" type="_QxPAiBV-EeeMzp7YIeMZtw" association="_QxSD5hV-EeeMzp7YIeMZtw"/>
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_QxSq4hV-EeeMzp7YIeMZtw" name="createUser"/>
+  </packagedElement>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_tczxwBVKEeeMzp7YIeMZtw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tczxwRVKEeeMzp7YIeMZtw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+  </profileApplication>
+</uml:Model>
diff --git a/src/test/TestCard.java b/src/test/TestCard.java
index 755e731..621a073 100644
--- a/src/test/TestCard.java
+++ b/src/test/TestCard.java
@@ -1,77 +1,76 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Cards.BasicFidelityCard;
-import Cards.LotteryFidelityCard;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-import User.User;
-
-public class TestCard {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testIDCard() {
-		BasicFidelityCard card1 = new BasicFidelityCard();
-		BasicFidelityCard card2 = new BasicFidelityCard();
-		assertTrue(card1.getId() != card2.getId());
-	}
-	
-	
-	@Test
-	public void testPointInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		henry.registerFidelityPlan("Point");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 5.0);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		assertTrue(henry.getPointInTheCard() == 1);
-	
-	}
-	
-	@Test
-	public void testPercentageInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		henry.registerFidelityPlan("Lottery");
-		manager.setProbabilityOnLoteryCard(henry.getCard(), 0.10);
-		assertTrue(((LotteryFidelityCard)henry.getCard()).getPercentage() == 0.10);
-
-	}
-	
-	@Test
-	public void testGetReduction(){
-		LotteryFidelityCard card = new LotteryFidelityCard();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.setProbabilityOnLoteryCard(card, 1.0);
-		boolean chance = card.getReduction();
-		assertTrue(chance);
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Cards.BasicFidelityCard;
+import Cards.LotteryFidelityCard;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+import User.User;
+
+public class TestCard {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testIDCard() {
+		BasicFidelityCard card1 = new BasicFidelityCard();
+		BasicFidelityCard card2 = new BasicFidelityCard();
+		assertTrue(card1.getId() != card2.getId());
+	}
+	
+	
+	@Test
+	public void testPointInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		henry.registerFidelityPlan("Point");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 5.0);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		assertTrue(henry.getPointInTheCard() == 1);
+	
+	}
+	
+	@Test
+	public void testPercentageInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, User.CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		henry.registerFidelityPlan("Lottery");
+		manager.setProbabilityOnLoteryCard(henry.getCard(), 0.10);
+		assertTrue(((LotteryFidelityCard)henry.getCard()).getPercentage() == 0.10);
+
+	}
+	
+	@Test
+	public void testGetReduction(){
+		LotteryFidelityCard card = new LotteryFidelityCard();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.setProbabilityOnLoteryCard(card, 1.0);
+		boolean chance = card.getReduction();
+		assertTrue(chance);
+	}
+
+}
diff --git a/src/test/TestCli.java b/src/test/TestCli.java
index 0b4a457..d330df8 100644
--- a/src/test/TestCli.java
+++ b/src/test/TestCli.java
@@ -1,48 +1,45 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import Cli.Clui;
-import Cli.errorWrongFormatValue;
-import Core.ActiveUserContext;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownStartegyType;
-import Others.Adress;
-import User.Manager;
-
-
-public class TestCli {
-
-	@Rule
-	public final ExpectedException exception = ExpectedException.none();
-	
-	@Test
-	public void testClui() throws ExceptionUnknownStartegyType{
-		MyFoodora foodora = null;
-		foodora = new MyFoodora();
-		ActiveUserContext activeUser = new ActiveUserContext(foodora);
-		Clui clui = new Clui(foodora,activeUser);
-		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		foodora.addManager(manager);
-		clui.executeCommand("login ceo 123456789");
-		assert(activeUser.getUser() == manager);
-	}
-	/*
-	@Test
-	public void testTokenWrongFormat() {
-		exception.expect(errorWrongFormatValue.class);
-		MyFoodora foodora = null;
-		foodora = new MyFoodora();
-		ActiveUserContext activeUser = new ActiveUserContext(foodora);
-		Clui clui = new Clui(foodora,activeUser);
-		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		foodora.addManager(manager);
-		clui.executeCommand("login ceo 123456789");
-		clui.executeCommand("registerCustomer 943684597 Jacques custo_jacques jacques@mail.fr jacques_pwd -9.8 23/02/1975");
-	}
-	*/
-}
+package test;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import Cli.Clui;
+import Core.ActiveUserContext;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import Others.Adress;
+import User.Manager;
+
+
+public class TestCli {
+
+	@Rule
+	public final ExpectedException exception = ExpectedException.none();
+	
+	@Test
+	public void testClui() throws ExceptionUnknownStartegyType{
+		MyFoodora foodora = null;
+		foodora = new MyFoodora();
+		ActiveUserContext activeUser = new ActiveUserContext(foodora);
+		Clui clui = new Clui(foodora,activeUser);
+		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		foodora.addManager(manager);
+		clui.executeCommand("login ceo 123456789");
+		assert(activeUser.getUser() == manager);
+	}
+	/*
+	@Test
+	public void testTokenWrongFormat() {
+		exception.expect(errorWrongFormatValue.class);
+		MyFoodora foodora = null;
+		foodora = new MyFoodora();
+		ActiveUserContext activeUser = new ActiveUserContext(foodora);
+		Clui clui = new Clui(foodora,activeUser);
+		Manager manager = new Manager(650588938, "ceo", "ceo", "ceo@centrale.supelec.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		foodora.addManager(manager);
+		clui.executeCommand("login ceo 123456789");
+		clui.executeCommand("registerCustomer 943684597 Jacques custo_jacques jacques@mail.fr jacques_pwd -9.8 23/02/1975");
+	}
+	*/
+}
diff --git a/src/test/TestCore.java b/src/test/TestCore.java
index 4ef1c6c..2c9567a 100644
--- a/src/test/TestCore.java
+++ b/src/test/TestCore.java
@@ -1,128 +1,128 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Order.Order;
-import Others.Adress;
-import Others.Date;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class TestCore {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testGetUserByLogin() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer customer = (Customer) foodora.getUserByLogin("henry", "124578");
-		assertTrue(customer.getName() == "henry");
-	}
-	
-	@Test
-	public void testGetUserByName() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer customer = (Customer) foodora.getUserByName("henry", "henry");
-		assertTrue(customer.getName() == "henry");
-	}
-	
-	@Test
-	public void testRemoveWithID() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		foodora.removeWithID(CUSTOMER, henry.getId());
-		assertTrue(foodora.getListCustomer().getList().size() ==0);
-
-	}
-	
-	@Test
-	public void testGetLastMonthIncome() throws ExceptionUnknownStartegyType{
-		MyFoodora foodora = new MyFoodora();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(5);
-		foodora.setServiceFee(10);
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		Others.Date today = new Others.Date(theYear, theMonth, theDay);
-		int lastMonth = 0;
-		int yearOfLastMonth = 0;
-		if(theMonth == 1){
-			yearOfLastMonth=today.getIntYear()-1;
-			lastMonth = 12;
-		}
-		else{
-			yearOfLastMonth=today.getIntYear();
-			lastMonth=today.getIntMonth()-1;
-		}
-		Order order1 = new Order();
-		Order order2 = new Order();
-		order1.setRestaurantAttached(resto);
-		order2.setRestaurantAttached(resto);
-		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
-		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
-		Dish dish1 = new Dish("pat�", "regular", 56);
-		order1.add(dish1);
-		Dish dish2 = new Dish("boulgour","glutenfree",44);
-		order2.add(dish2);
-		foodora.getGlobalHistoric().getListOrder().add(order2);
-		foodora.getGlobalHistoric().getListOrder().add(order1);
-		assertTrue(foodora.getLastMonthIncome()==100);
-	}
-	
-	@Test
-	public void testGetLastMonthNumberOfCommands() throws ExceptionUnknownStartegyType{
-		MyFoodora foodora = new MyFoodora();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(5);
-		foodora.setServiceFee(10);
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		Others.Date today = new Others.Date(theYear, theMonth, theDay);
-		int lastMonth = 0;
-		int yearOfLastMonth = 0;
-		if(theMonth == 1){
-			yearOfLastMonth=today.getIntYear()-1;
-			lastMonth = 12;
-		}
-		else{
-			yearOfLastMonth=today.getIntYear();
-			lastMonth=today.getIntMonth()-1;
-		}
-		Order order1 = new Order();
-		Order order2 = new Order();
-		order1.setRestaurantAttached(resto);
-		order2.setRestaurantAttached(resto);
-		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
-		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
-		Dish dish1 = new Dish("pat�", "regular", 56);
-		order1.add(dish1);
-		Dish dish2 = new Dish("boulgour","glutenfree",44);
-		order2.add(dish2);
-		foodora.getGlobalHistoric().getListOrder().add(order2);
-		foodora.getGlobalHistoric().getListOrder().add(order1);
-		assertTrue(foodora.getNumberOfOrderLastMonth()==2);
-		
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Item.Dish;
+import Order.Order;
+import Others.Adress;
+import Others.Date;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestCore {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testGetUserByLogin() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer customer = (Customer) foodora.getUserByLogin("henry", "124578");
+		assertTrue(customer.getName() == "henry");
+	}
+	
+	@Test
+	public void testGetUserByName() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer customer = (Customer) foodora.getUserByName("henry", "henry");
+		assertTrue(customer.getName() == "henry");
+	}
+	
+	@Test
+	public void testRemoveWithID() throws ExceptionUnknownTypeOfUser, ExceptionUnknownStartegyType{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		foodora.removeWithID(CUSTOMER, henry.getId());
+		assertTrue(foodora.getListCustomer().getList().size() ==0);
+
+	}
+	
+	@Test
+	public void testGetLastMonthIncome() throws ExceptionUnknownStartegyType{
+		MyFoodora foodora = new MyFoodora();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(5);
+		foodora.setServiceFee(10);
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		Others.Date today = new Others.Date(theYear, theMonth, theDay);
+		int lastMonth = 0;
+		int yearOfLastMonth = 0;
+		if(theMonth == 1){
+			yearOfLastMonth=today.getIntYear()-1;
+			lastMonth = 12;
+		}
+		else{
+			yearOfLastMonth=today.getIntYear();
+			lastMonth=today.getIntMonth()-1;
+		}
+		Order order1 = new Order();
+		Order order2 = new Order();
+		order1.setRestaurantAttached(resto);
+		order2.setRestaurantAttached(resto);
+		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
+		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
+		Dish dish1 = new Dish("pat�", "regular", 56);
+		order1.add(dish1);
+		Dish dish2 = new Dish("boulgour","glutenfree",44);
+		order2.add(dish2);
+		foodora.getGlobalHistoric().getListOrder().add(order2);
+		foodora.getGlobalHistoric().getListOrder().add(order1);
+		assertTrue(foodora.getLastMonthIncome()==100);
+	}
+	
+	@Test
+	public void testGetLastMonthNumberOfCommands() throws ExceptionUnknownStartegyType{
+		MyFoodora foodora = new MyFoodora();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(5);
+		foodora.setServiceFee(10);
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		Others.Date today = new Others.Date(theYear, theMonth, theDay);
+		int lastMonth = 0;
+		int yearOfLastMonth = 0;
+		if(theMonth == 1){
+			yearOfLastMonth=today.getIntYear()-1;
+			lastMonth = 12;
+		}
+		else{
+			yearOfLastMonth=today.getIntYear();
+			lastMonth=today.getIntMonth()-1;
+		}
+		Order order1 = new Order();
+		Order order2 = new Order();
+		order1.setRestaurantAttached(resto);
+		order2.setRestaurantAttached(resto);
+		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
+		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
+		Dish dish1 = new Dish("pat�", "regular", 56);
+		order1.add(dish1);
+		Dish dish2 = new Dish("boulgour","glutenfree",44);
+		order2.add(dish2);
+		foodora.getGlobalHistoric().getListOrder().add(order2);
+		foodora.getGlobalHistoric().getListOrder().add(order1);
+		assertTrue(foodora.getNumberOfOrderLastMonth()==2);
+		
+	}
+
+}
diff --git a/src/test/TestCourier.java b/src/test/TestCourier.java
index c650e52..a2a97ec 100644
--- a/src/test/TestCourier.java
+++ b/src/test/TestCourier.java
@@ -1,115 +1,113 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import Others.Period;
-import Others.Position;
-import User.Courier;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class TestCourier {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testSetPosition() {
-		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
-		courier.setPosition(new Position(10.0, 15.0));
-		assertTrue(courier.getPosition().getX() == 10.0);
-	}
-
-	@Test
-	public void testSetAvailable() {
-		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
-		courier.setAvailable();
-		assertTrue(courier.isAvailable());
-	}
-
-	@Test
-	public void testSetNotAvailable() {
-		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
-		courier.setNotAvailable();
-		assertTrue(courier.isAvailable() == false);
-	}
-
-	@Test
-	public void testRegister() throws ExceptionUnknownStartegyType {
-		Courier martin = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
-		MyFoodora foodora = new MyFoodora();
-		martin.register(foodora);
-		boolean isIn = false;
-		for(Courier courier : foodora.getListCourier().getList()){
-			if(courier.getName() == "martin"){
-				isIn = true;
-			}
-		}
-		
-		assertTrue(isIn);
-	}
-
-	@Test
-	public void testUnregister() throws ExceptionUnknownStartegyType {
-		Courier martin = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
-		MyFoodora foodora = new MyFoodora();
-		martin.register(foodora);
-		martin.unregister(foodora);
-		boolean isIn = false;
-		for(Courier courier : foodora.getListCourier().getList()){
-			if(courier.getName() == "martin"){
-				isIn = true;
-			}
-		}
-		
-		assertTrue(isIn == false);
-	}
-
-	@Test
-	public void testAcceptDelivery() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		assertTrue(martin.getHistoricOrder().getListOrder().size() !=0);
-	}
-
-	@Test
-	public void testGetNbOfOrderOfTheDay() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		assertTrue(martin.getNbOfOrderOfTheDay() == 1);
-	}
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import Others.Position;
+import User.Courier;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestCourier {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testSetPosition() {
+		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
+		courier.setPosition(new Position(10.0, 15.0));
+		assertTrue(courier.getPosition().getX() == 10.0);
+	}
+
+	@Test
+	public void testSetAvailable() {
+		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
+		courier.setAvailable();
+		assertTrue(courier.isAvailable());
+	}
+
+	@Test
+	public void testSetNotAvailable() {
+		Courier courier = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
+		courier.setNotAvailable();
+		assertTrue(courier.isAvailable() == false);
+	}
+
+	@Test
+	public void testRegister() throws ExceptionUnknownStartegyType {
+		Courier martin = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
+		MyFoodora foodora = new MyFoodora();
+		martin.register(foodora);
+		boolean isIn = false;
+		for(Courier courier : foodora.getListCourier().getList()){
+			if(courier.getName() == "martin"){
+				isIn = true;
+			}
+		}
+		
+		assertTrue(isIn);
+	}
+
+	@Test
+	public void testUnregister() throws ExceptionUnknownStartegyType {
+		Courier martin = new Courier(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou");
+		MyFoodora foodora = new MyFoodora();
+		martin.register(foodora);
+		martin.unregister(foodora);
+		boolean isIn = false;
+		for(Courier courier : foodora.getListCourier().getList()){
+			if(courier.getName() == "martin"){
+				isIn = true;
+			}
+		}
+		
+		assertTrue(isIn == false);
+	}
+
+	@Test
+	public void testAcceptDelivery() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		assertTrue(martin.getHistoricOrder().getListOrder().size() !=0);
+	}
+
+	@Test
+	public void testGetNbOfOrderOfTheDay() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		assertTrue(martin.getNbOfOrderOfTheDay() == 1);
+	}
+}
diff --git a/src/test/TestCustomer.java b/src/test/TestCustomer.java
index 3d9d126..d696d73 100644
--- a/src/test/TestCustomer.java
+++ b/src/test/TestCustomer.java
@@ -1,107 +1,104 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Cards.BasicFidelityCard;
-import Cards.FidelityCard;
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Others.Adress;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class TestCustomer {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testGetCard() throws ExceptionUnknownStartegyType{
-		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
-		FidelityCard card = henry.getCard();
-		assertTrue(card.returnType() == "Basic");
-		
-	}
-
-	@Test
-	public void testPlaceOrder() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType,  ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		assertTrue(henry.getHistoricOrder().getListOrder().size() == 1);
-	}
-
-	@Test
-	public void testRegisterFidelityPlan() {
-		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
-		henry.registerFidelityPlan("Point");
-		FidelityCard card = henry.getCard();
-		assertTrue(card.returnType() == "Point");
-
-	}
-
-	@Test
-	public void testUnregisterFidelityPlan() {
-		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
-		henry.registerFidelityPlan("Point");
-		henry.unregisterFidelityPlan();
-		FidelityCard card = henry.getCard();
-		assertTrue(card.returnType() == "Basic");
-
-	}
-
-	@Test
-	public void testGetPointInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		henry.registerFidelityPlan("Point");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		assertTrue(henry.getPointInTheCard() == 1);
-	}
-
-
-	@Test
-	public void testAcceptSpam() {
-		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
-		henry.setSpamAgree(false);
-		henry.acceptSpam();
-		assertTrue(henry.isSpamAgree());
-	}
-
-	@Test
-	public void testRefuseSpam() {
-		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
-		henry.refuseSpam();
-		assertTrue(henry.isSpamAgree() == false);
-	}
-
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Cards.FidelityCard;
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestCustomer {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testGetCard() throws ExceptionUnknownStartegyType{
+		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
+		FidelityCard card = henry.getCard();
+		assertTrue(card.returnType() == "Basic");
+		
+	}
+
+	@Test
+	public void testPlaceOrder() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType,  ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		assertTrue(henry.getHistoricOrder().getListOrder().size() == 1);
+	}
+
+	@Test
+	public void testRegisterFidelityPlan() {
+		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
+		henry.registerFidelityPlan("Point");
+		FidelityCard card = henry.getCard();
+		assertTrue(card.returnType() == "Point");
+
+	}
+
+	@Test
+	public void testUnregisterFidelityPlan() {
+		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
+		henry.registerFidelityPlan("Point");
+		henry.unregisterFidelityPlan();
+		FidelityCard card = henry.getCard();
+		assertTrue(card.returnType() == "Basic");
+
+	}
+
+	@Test
+	public void testGetPointInTheCard() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		henry.registerFidelityPlan("Point");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		assertTrue(henry.getPointInTheCard() == 1);
+	}
+
+
+	@Test
+	public void testAcceptSpam() {
+		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
+		henry.setSpamAgree(false);
+		henry.acceptSpam();
+		assertTrue(henry.isSpamAgree());
+	}
+
+	@Test
+	public void testRefuseSpam() {
+		Customer henry = new Customer(0245, "henry", "henry", "henry.dupont@homtail.fr", "123456789", new Adress(10.2, 12.0), true, "25/02/1578", "henrynou");
+		henry.refuseSpam();
+		assertTrue(henry.isSpamAgree() == false);
+	}
+
+
+}
diff --git a/src/test/TestDeliveryStrategy.java b/src/test/TestDeliveryStrategy.java
index 2d5e715..df30fb5 100644
--- a/src/test/TestDeliveryStrategy.java
+++ b/src/test/TestDeliveryStrategy.java
@@ -1,68 +1,67 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-
-import DeliveryStrategy.ContextDeliveryStrategy;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import Others.Position;
-import User.Courier;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class TestDeliveryStrategy {
-
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-	
-	@Test
-	public void testFastestDelivery() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(1.0	, 2.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(3.0, -2.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(1.0, 1.0), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FastestDelivery");
-		manager.setDeliveryPolicy(foodora, newStrategy);
-		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
-		Courier martin2 = (Courier) foodora.getUserByName("martin2", "martin2");
-		martin.setPosition(new Position(1.0, 2.0));
-		martin2.setPosition(new Position(18.0, 20.0));
-		Courier courierToChoose = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(resto1, henry, foodora.getListCourier().getList());
-		assertTrue(courierToChoose.getName() == "martin");
-		
-		
-	}
-	
-	@Test
-	public void testFairOccupation() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(1.0	, 2.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(3.0, -2.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(1.0, 1.0), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FairOccupation");
-		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
-		martin.setNbOfLivraison(20);
-		Courier courierToChoose = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(resto1, henry, foodora.getListCourier().getList());
-		assertTrue(courierToChoose.getName() == "martin2");
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+
+import DeliveryStrategy.ContextDeliveryStrategy;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import Others.Position;
+import User.Courier;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestDeliveryStrategy {
+
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+	
+	@Test
+	public void testFastestDelivery() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(1.0	, 2.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(3.0, -2.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(1.0, 1.0), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FastestDelivery");
+		manager.setDeliveryPolicy(foodora, newStrategy);
+		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
+		Courier martin2 = (Courier) foodora.getUserByName("martin2", "martin2");
+		martin.setPosition(new Position(1.0, 2.0));
+		martin2.setPosition(new Position(18.0, 20.0));
+		Courier courierToChoose = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(resto1, henry, foodora.getListCourier().getList());
+		assertTrue(courierToChoose.getName() == "martin");
+		
+		
+	}
+	
+	@Test
+	public void testFairOccupation() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(1.0	, 2.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(3.0, -2.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(1.0, 1.0), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FairOccupation");
+		Courier martin = (Courier) foodora.getUserByName("martin", "martin");
+		martin.setNbOfLivraison(20);
+		Courier courierToChoose = foodora.getContextDeliveryPolicy().getStrategy().chooseCourier(resto1, henry, foodora.getListCourier().getList());
+		assertTrue(courierToChoose.getName() == "martin2");
+	}
+
+}
diff --git a/src/test/TestException.java b/src/test/TestException.java
index 8faa6f4..63b0254 100644
--- a/src/test/TestException.java
+++ b/src/test/TestException.java
@@ -1,106 +1,106 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import DeliveryStrategy.ContextDeliveryStrategy;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Item.FactoryDish;
-import Item.FactoryMeal;
-import Item.Meal;
-import Others.Adress;
-import StrategyProfit.ContextTargetProfitStrategy;
-import User.Manager;
-
-public class TestException {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4; 
-	@Test
-	public void testExceptionUnknownDishType() {
-		try{
-			FactoryDish factory1 = new FactoryDish();
-			Dish dish = factory1.createDish("Error", "pat�", "glutenfree", 4.5);
-		}
-		catch (ExceptionUnknownDishType e) {
-			assertTrue(true);
-		}
-	
-	}
-	
-	@Test
-	public void testExceptionUnknownMealType(){
-		try {
-			FactoryMeal factory = new FactoryMeal();
-			Meal meal = factory.createMeal("meal1", "eror");
-			
-		} catch (ExceptionUnknownMealType e) {
-			assertTrue(true);
-		}
-	}
-	
-	@Test
-	public void testExceptionUnknownStartegyDelivery(){
-		try{
-			MyFoodora foodora = new MyFoodora();
-			ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("eror");
-			foodora.setContextDeliveryPolicy(newStrategy);
-		}
-		catch (ExceptionUnknownStartegyType e) {
-			assertTrue(true);
-		}
-	}
-	
-	@Test
-	public void testExceptionUnknownStartegyProfit(){
-		try{
-			MyFoodora foodora = new MyFoodora();
-			ContextTargetProfitStrategy newStrategy = new ContextTargetProfitStrategy("eror");
-			foodora.setContextTargetProfitStrategy(newStrategy);
-		}
-		catch (ExceptionUnknownStartegyType e) {
-			assertTrue(true);
-		}
-	}
-	
-	@Test 
-	public void testExceptionUnknownTypeOfUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		try { manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "error");
-		}
-		catch (ExceptionUnknownTypeOfUser e) {
-			assertTrue(true);
-		}
-		
-		try { manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, 25, "Human");
-		}
-		catch (ExceptionUnknownTypeOfUser e) {
-			assertTrue(true);
-		}
-		
-		try { manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"eror");
-
-		}
-		catch (ExceptionUnknownTypeOfUser e) {
-			assertTrue(true);
-		}
-		try { manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,75,"Moral");
-
-		}
-		catch (ExceptionUnknownTypeOfUser e) {
-			assertTrue(true);
-		}
-	}
-		
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import DeliveryStrategy.ContextDeliveryStrategy;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Item.Dish;
+import Item.FactoryDish;
+import Item.FactoryMeal;
+import Item.Meal;
+import Others.Adress;
+import StrategyProfit.ContextTargetProfitStrategy;
+import User.Manager;
+
+public class TestException {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4; 
+	@Test
+	public void testExceptionUnknownDishType() {
+		try{
+			FactoryDish factory1 = new FactoryDish();
+			Dish dish = factory1.createDish("Error", "pat�", "glutenfree", 4.5);
+		}
+		catch (ExceptionUnknownDishType e) {
+			assertTrue(true);
+		}
+	
+	}
+	
+	@Test
+	public void testExceptionUnknownMealType(){
+		try {
+			FactoryMeal factory = new FactoryMeal();
+			Meal meal = factory.createMeal("meal1", "eror");
+			
+		} catch (ExceptionUnknownMealType e) {
+			assertTrue(true);
+		}
+	}
+	
+	@Test
+	public void testExceptionUnknownStartegyDelivery(){
+		try{
+			MyFoodora foodora = new MyFoodora();
+			ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("eror");
+			foodora.setContextDeliveryPolicy(newStrategy);
+		}
+		catch (ExceptionUnknownStartegyType e) {
+			assertTrue(true);
+		}
+	}
+	
+	@Test
+	public void testExceptionUnknownStartegyProfit(){
+		try{
+			MyFoodora foodora = new MyFoodora();
+			ContextTargetProfitStrategy newStrategy = new ContextTargetProfitStrategy("eror");
+			foodora.setContextTargetProfitStrategy(newStrategy);
+		}
+		catch (ExceptionUnknownStartegyType e) {
+			assertTrue(true);
+		}
+	}
+	
+	@Test 
+	public void testExceptionUnknownTypeOfUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		try { manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "error");
+		}
+		catch (ExceptionUnknownTypeOfUser e) {
+			assertTrue(true);
+		}
+		
+		try { manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, 25, "Human");
+		}
+		catch (ExceptionUnknownTypeOfUser e) {
+			assertTrue(true);
+		}
+		
+		try { manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"eror");
+
+		}
+		catch (ExceptionUnknownTypeOfUser e) {
+			assertTrue(true);
+		}
+		try { manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,75,"Moral");
+
+		}
+		catch (ExceptionUnknownTypeOfUser e) {
+			assertTrue(true);
+		}
+	}
+		
+
+}
diff --git a/src/test/TestItem.java b/src/test/TestItem.java
index fc26484..82af186 100644
--- a/src/test/TestItem.java
+++ b/src/test/TestItem.java
@@ -1,88 +1,84 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import javax.print.DocFlavor.INPUT_STREAM;
-
-import org.junit.Test;
-
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Item.Dessert;
-import Item.Dish;
-import Item.FactoryDish;
-import Item.FactoryMeal;
-import Item.Meal;
-
-public class TestItem {
-
-	@Test
-	public void testCreateDish() throws ExceptionUnknownDishType {
-		FactoryDish factory = new FactoryDish();
-		Dish dish = factory.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		assertTrue(dish instanceof Dessert);
-		assertTrue(dish.getPrice() == 4.5);
-	}
-	
-	@Test
-	public void testCreateHalfMeal() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "HalfMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		meal.addDish(dish2);
-		meal.addDish(dish);
-		assertTrue(meal.getPrice() == 10.0);
-	}
-
-	@Test
-	public void testCreateFullMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType{
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "FullMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
-		meal.addDish(dish3);
-		meal.addDish(dish2);
-		meal.addDish(dish);
-		assertTrue(meal.getPrice() == 15.0);
-	}
-	
-	
-	@Test
-	public void testAddDish() throws ExceptionUnknownDishType, ExceptionUnknownMealType, IOException{
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "FullMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		Dish dish3 = factory1.createDish("Dessert", "soupe", "glutenfree", 5);
-		meal.addDish(dish);
-	    meal.addDish(dish2);
-		meal.addDish(dish3);
-		assertTrue(meal.getPrice() == 10.5);
-	}
-	
-	
-	@Test
-	public void testRemoveDish() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "FullMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
-		meal.addDish(dish);
-	    meal.addDish(dish2);
-		meal.addDish(dish3);
-		meal.removeDish("soupe");;
-		assertTrue(meal.getPrice() == 10.0);
-	}
-	
-	
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import org.junit.Test;
+
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Item.Dessert;
+import Item.Dish;
+import Item.FactoryDish;
+import Item.FactoryMeal;
+import Item.Meal;
+
+public class TestItem {
+
+	@Test
+	public void testCreateDish() throws ExceptionUnknownDishType {
+		FactoryDish factory = new FactoryDish();
+		Dish dish = factory.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		assertTrue(dish instanceof Dessert);
+		assertTrue(dish.getPrice() == 4.5);
+	}
+	
+	@Test
+	public void testCreateHalfMeal() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "HalfMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		meal.addDish(dish2);
+		meal.addDish(dish);
+		assertTrue(meal.getPrice() == 10.0);
+	}
+
+	@Test
+	public void testCreateFullMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType{
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "FullMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
+		meal.addDish(dish3);
+		meal.addDish(dish2);
+		meal.addDish(dish);
+		assertTrue(meal.getPrice() == 15.0);
+	}
+	
+	
+	@Test
+	public void testAddDish() throws ExceptionUnknownDishType, ExceptionUnknownMealType, IOException{
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "FullMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		Dish dish3 = factory1.createDish("Dessert", "soupe", "glutenfree", 5);
+		meal.addDish(dish);
+	    meal.addDish(dish2);
+		meal.addDish(dish3);
+		assertTrue(meal.getPrice() == 10.5);
+	}
+	
+	
+	@Test
+	public void testRemoveDish() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "FullMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
+		meal.addDish(dish);
+	    meal.addDish(dish2);
+		meal.addDish(dish3);
+		meal.removeDish("soupe");;
+		assertTrue(meal.getPrice() == 10.0);
+	}
+	
+	
+}
diff --git a/src/test/TestManager.java b/src/test/TestManager.java
index d8b2b6b..992f73f 100644
--- a/src/test/TestManager.java
+++ b/src/test/TestManager.java
@@ -1,268 +1,260 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import DeliveryStrategy.ContextDeliveryStrategy;
-import DeliveryStrategy.StrategyDeliveryPolicy;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Others.Adress;
-import Others.Period;
-import StrategyProfit.ContextTargetProfitStrategy;
-import StrategyProfit.TargetProfitMarkup;
-import User.Courier;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-import User.User;
-import UserFactoryPattern.FactoryUserFactory;
-import UserFactoryPattern.UserFactory;
-
-public class TestManager {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testAddUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		boolean isIn = false;
-		for(Customer customer : foodora.getListCustomer().getList()){
-			if(customer.getName() == "henry"){
-				isIn = true;
-			}
-		}
-		assertTrue(isIn);
-		
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,null, null, foodora,RESTAURANT,"Moral");
-		boolean isIn2 = false;
-		for(Restaurant restaurant : foodora.getListRestaurant().getList()){
-			if(restaurant.getName() == "La tani�re"){
-				isIn2 = true;
-			}
-		}
-		
-		assertTrue(isIn2);
-		
-	}
-
-	@Test
-	public void testRemoveUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = null;
-		for(Customer customer : foodora.getListCustomer().getList()){
-			if(customer.getName() == "henry"){
-				henry = customer;
-			}
-		}
-		manager.removeUser(henry, foodora);
-		boolean isNotIn = true;
-		for(Customer customer : foodora.getListCustomer().getList()){
-			if(customer.getName() == "henry"){
-				isNotIn = false;
-			}
-		}
-		assertTrue(isNotIn);
-	}
-
-	@Test
-	public void testChangeServiceFee() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.changeServiceFee(4.5, foodora);
-		assertTrue(foodora.getServiceFee() == 4.5);
-		}
-
-	@Test
-	public void testGetTotalIncome() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		Others.Date begin = new Others.Date(2017, 04, 30);
-		Others.Date end = new Others.Date(2018, 12, 14);
-		Period period = new Period(begin, end);
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		double totalIncome = manager.getTotalIncome(period, foodora);
-		assertTrue(totalIncome == 4.5);
-	}
-
-	@Test
-	public void testGetTotalProfit() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType,ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(10);
-		foodora.setServiceFee(10);
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		Others.Date begin = new Others.Date(2017, 04, 30);
-		Others.Date end = new Others.Date(2018, 12, 14);
-		Period period = new Period(begin, end);
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 100);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		double totalProfit = manager.getTotalProfit(period, foodora);
-		assertTrue(totalProfit == 5.);
-	}
-
-	@Test
-	public void testGetAverageIncomePerCustomer() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		Others.Date begin = new Others.Date(2017, 04, 30);
-		Others.Date end = new Others.Date(2018, 12, 14);
-		Period period = new Period(begin, end);
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0146, "henry2", "henry2", "henry2.dupont@hotmail.fr", "1245789", new Adress(11.0, 15.3), true, "25/12/1995", "henrynou2", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 5.0);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		double averageIncomePerCustomer = manager.getAverageIncomePerCustomer(foodora, period);
-		assertTrue(averageIncomePerCustomer == 5.0);
-	}
-
-	@Test
-	public void testSetTargetProfitPolicy() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		ContextTargetProfitStrategy newStrategy = new ContextTargetProfitStrategy("ServiceFee");
-		manager.setTargetProfitPolicy(foodora, newStrategy);
-		assertTrue(foodora.getContextTargetProfitStrategy().toString() == "ServiceFee");
-	}
-
-	@Test
-	public void testSetDeliveryPolicy() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FastestDelivery");
-		manager.setDeliveryPolicy(foodora, newStrategy);
-		assertTrue(foodora.getContextDeliveryPolicy().toString() == "FastestDelivery");	
-	}
-
-	@Test
-	public void testGetMostSellingRestaurant() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "La tani�re2", "Lataniere2", "contact@lataniere2.fr", "12345", new Adress(10.0, 18.0), true,null, null, foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		String mostSellingOne = manager.getMostSellingRestaurant(foodora);
-		assertTrue(mostSellingOne == "La tani�re");
-	}
-
-	@Test
-	public void testGetLeastSellingRestaurant() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		manager.addUser(0245, "La tani�re2", "Lataniere2", "contact@lataniere2.fr", "12345", new Adress(10.0, 18.0), true,null, null, foodora,RESTAURANT,"Moral");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		String mostSellingOne = manager.getLeastSellingRestaurant(foodora);
-		assertTrue(mostSellingOne == "La tani�re2");
-	}
-
-	@Test
-	public void testGetLeastActiveCourier() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		String leastActiveCourier = manager.getLeastActiveCourier(foodora);
-		assertTrue(leastActiveCourier == "martin");
-	}
-
-	@Test
-	public void testGetMostActiveCourier() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
-		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		ArrayList<String> command = new ArrayList<String>();
-		command.add("pat�");
-		henry.placeOrder(resto1, "Dish", command, foodora);
-		String mostActiveCourier = manager.getMostActiveCourier(foodora);
-		assertTrue(mostActiveCourier == "martin2");
-	}
-
-	@Test
-	public void testActivateUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		henry.setActivated(false);
-		manager.activateUser(foodora, henry);
-		assertTrue(henry.isActivated());
-	}
-
-	@Test
-	public void testDesactivateUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		henry.setActivated(true);
-		manager.desactivateUser(foodora, henry);
-		assertTrue(henry.isActivated() == false);	
-		
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import DeliveryStrategy.ContextDeliveryStrategy;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import Others.Period;
+import StrategyProfit.ContextTargetProfitStrategy;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestManager {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testAddUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		boolean isIn = false;
+		for(Customer customer : foodora.getListCustomer().getList()){
+			if(customer.getName() == "henry"){
+				isIn = true;
+			}
+		}
+		assertTrue(isIn);
+		
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,null, null, foodora,RESTAURANT,"Moral");
+		boolean isIn2 = false;
+		for(Restaurant restaurant : foodora.getListRestaurant().getList()){
+			if(restaurant.getName() == "La tani�re"){
+				isIn2 = true;
+			}
+		}
+		
+		assertTrue(isIn2);
+		
+	}
+
+	@Test
+	public void testRemoveUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = null;
+		for(Customer customer : foodora.getListCustomer().getList()){
+			if(customer.getName() == "henry"){
+				henry = customer;
+			}
+		}
+		manager.removeUser(henry, foodora);
+		boolean isNotIn = true;
+		for(Customer customer : foodora.getListCustomer().getList()){
+			if(customer.getName() == "henry"){
+				isNotIn = false;
+			}
+		}
+		assertTrue(isNotIn);
+	}
+
+	@Test
+	public void testChangeServiceFee() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.changeServiceFee(4.5, foodora);
+		assertTrue(foodora.getServiceFee() == 4.5);
+		}
+
+	@Test
+	public void testGetTotalIncome() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		Others.Date begin = new Others.Date(2017, 04, 30);
+		Others.Date end = new Others.Date(2018, 12, 14);
+		Period period = new Period(begin, end);
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		double totalIncome = manager.getTotalIncome(period, foodora);
+		assertTrue(totalIncome == 4.5);
+	}
+
+	@Test
+	public void testGetTotalProfit() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType,ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(10);
+		foodora.setServiceFee(10);
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		Others.Date begin = new Others.Date(2017, 04, 30);
+		Others.Date end = new Others.Date(2018, 12, 14);
+		Period period = new Period(begin, end);
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 100);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		double totalProfit = manager.getTotalProfit(period, foodora);
+		assertTrue(totalProfit == 5.);
+	}
+
+	@Test
+	public void testGetAverageIncomePerCustomer() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		Others.Date begin = new Others.Date(2017, 04, 30);
+		Others.Date end = new Others.Date(2018, 12, 14);
+		Period period = new Period(begin, end);
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0146, "henry2", "henry2", "henry2.dupont@hotmail.fr", "1245789", new Adress(11.0, 15.3), true, "25/12/1995", "henrynou2", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 5.0);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		double averageIncomePerCustomer = manager.getAverageIncomePerCustomer(foodora, period);
+		assertTrue(averageIncomePerCustomer == 5.0);
+	}
+
+	@Test
+	public void testSetTargetProfitPolicy() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		ContextTargetProfitStrategy newStrategy = new ContextTargetProfitStrategy("ServiceFee");
+		manager.setTargetProfitPolicy(foodora, newStrategy);
+		assertTrue(foodora.getContextTargetProfitStrategy().toString() == "ServiceFee");
+	}
+
+	@Test
+	public void testSetDeliveryPolicy() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		ContextDeliveryStrategy newStrategy = new ContextDeliveryStrategy("FastestDelivery");
+		manager.setDeliveryPolicy(foodora, newStrategy);
+		assertTrue(foodora.getContextDeliveryPolicy().toString() == "FastestDelivery");	
+	}
+
+	@Test
+	public void testGetMostSellingRestaurant() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "La tani�re2", "Lataniere2", "contact@lataniere2.fr", "12345", new Adress(10.0, 18.0), true,null, null, foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		String mostSellingOne = manager.getMostSellingRestaurant(foodora);
+		assertTrue(mostSellingOne == "La tani�re");
+	}
+
+	@Test
+	public void testGetLeastSellingRestaurant() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		manager.addUser(0245, "La tani�re2", "Lataniere2", "contact@lataniere2.fr", "12345", new Adress(10.0, 18.0), true,null, null, foodora,RESTAURANT,"Moral");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		String mostSellingOne = manager.getLeastSellingRestaurant(foodora);
+		assertTrue(mostSellingOne == "La tani�re2");
+	}
+
+	@Test
+	public void testGetLeastActiveCourier() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		String leastActiveCourier = manager.getLeastActiveCourier(foodora);
+		assertTrue(leastActiveCourier == "martin");
+	}
+
+	@Test
+	public void testGetMostActiveCourier() throws ExceptionUnknownStartegyType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "martin", "martin", "martin.zebre@hotmail.fr", "1234", new Adress(10.0, 18.0), true,"25/12/1945", "martinou", foodora,COURIER,"Human");
+		manager.addUser(0246, "martin2", "martin2", "martin2.zebre@hotmail.fr", "12345", new Adress(10.0, 18.0), true,"25/12/1945", "martinou2", foodora,COURIER,"Human");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		ArrayList<String> command = new ArrayList<String>();
+		command.add("pat�");
+		henry.placeOrder(resto1, "Dish", command, foodora);
+		String mostActiveCourier = manager.getMostActiveCourier(foodora);
+		assertTrue(mostActiveCourier == "martin2");
+	}
+
+	@Test
+	public void testActivateUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		henry.setActivated(false);
+		manager.activateUser(foodora, henry);
+		assertTrue(henry.isActivated());
+	}
+
+	@Test
+	public void testDesactivateUser() throws ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		henry.setActivated(true);
+		manager.desactivateUser(foodora, henry);
+		assertTrue(henry.isActivated() == false);	
+		
+	}
+
+}
diff --git a/src/test/TestOffers.java b/src/test/TestOffers.java
index 14118f4..911e0bc 100644
--- a/src/test/TestOffers.java
+++ b/src/test/TestOffers.java
@@ -1,80 +1,79 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Item.FactoryDish;
-import Item.FactoryMeal;
-import Item.Meal;
-import Offers.MealOfTheWeek;
-import Order.Order;
-import Others.Adress;
-import Others.Period;
-import User.Customer;
-import User.Manager;
-import User.Restaurant;
-
-public class TestOffers {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-
-	@Test
-	public void testNotifyObservers() throws ExceptionUnknownMealType, ExceptionUnknownDishType {
-		Customer customer = new Customer(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou");
-		Restaurant r = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		Order order = new Order();
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "FullMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
-		meal.addDish(dish3);
-		meal.addDish(dish2);
-		meal.addDish(dish);
-		MealOfTheWeek mealOfTheWeek = new MealOfTheWeek(meal);
-		mealOfTheWeek.attachObserver(customer);
-		mealOfTheWeek.setInterests(r);
-		assertTrue(customer.getNbOfOfferReceived() == 1);
-	}
-	
-	@Test
-	public void testInFoodora() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownMealType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
-		manager.addUser(0146, "henry2", "henry2", "henry2.dupont@hotmail.fr", "1245789", new Adress(11.0, 15.3), true, "25/12/1995", "henrynou2", foodora, CUSTOMER, "Human");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
-		Customer henry2 = (Customer) foodora.getUserByName("henry2", "henry2");
-		henry2.refuseSpam();
-		Restaurant resto = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto.addDish("Starter","boulgour","vegetarian", 5);
-		resto.addDish("Dessert", "fondant", "regular", 7);
-		Dish pat� = resto.getDishByName("pat�");
-		Dish boulgour = resto.getDishByName("boulgour");
-		Dish fondant = resto.getDishByName("fondant");
-		resto.createMeal("meal1", "FullMeal");
-		Meal meal1 = resto.getMealByName("meal1");
-		resto.addDishToMeal(fondant, meal1);
-		resto.addDishToMeal(boulgour, meal1);
-		resto.addDishToMeal(pat�, meal1);
-		resto.addMealOfTheWeek(foodora, "meal1");
-		assertTrue(henry.getNbOfOfferReceived() ==1);
-		assertTrue(henry2.getNbOfOfferReceived() == 0);
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Item.Dish;
+import Item.FactoryDish;
+import Item.FactoryMeal;
+import Item.Meal;
+import Offers.MealOfTheWeek;
+import Order.Order;
+import Others.Adress;
+import User.Customer;
+import User.Manager;
+import User.Restaurant;
+
+public class TestOffers {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+
+	@Test
+	public void testNotifyObservers() throws ExceptionUnknownMealType, ExceptionUnknownDishType {
+		Customer customer = new Customer(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou");
+		Restaurant r = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		Order order = new Order();
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "FullMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
+		meal.addDish(dish3);
+		meal.addDish(dish2);
+		meal.addDish(dish);
+		MealOfTheWeek mealOfTheWeek = new MealOfTheWeek(meal);
+		mealOfTheWeek.attachObserver(customer);
+		mealOfTheWeek.setInterests(r);
+		assertTrue(customer.getNbOfOfferReceived() == 1);
+	}
+	
+	@Test
+	public void testInFoodora() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownMealType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0145, "henry", "henry", "henry.dupont@hotmail.fr", "124578", new Adress(11.0, 15.2), true, "25/12/1994", "henrynou", foodora, CUSTOMER, "Human");
+		manager.addUser(0146, "henry2", "henry2", "henry2.dupont@hotmail.fr", "1245789", new Adress(11.0, 15.3), true, "25/12/1995", "henrynou2", foodora, CUSTOMER, "Human");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		Customer henry = (Customer) foodora.getUserByName("henry", "henry");
+		Customer henry2 = (Customer) foodora.getUserByName("henry2", "henry2");
+		henry2.refuseSpam();
+		Restaurant resto = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto.addDish("Starter","boulgour","vegetarian", 5);
+		resto.addDish("Dessert", "fondant", "regular", 7);
+		Dish pat� = resto.getDishByName("pat�");
+		Dish boulgour = resto.getDishByName("boulgour");
+		Dish fondant = resto.getDishByName("fondant");
+		resto.createMeal("meal1", "FullMeal");
+		Meal meal1 = resto.getMealByName("meal1");
+		resto.addDishToMeal(fondant, meal1);
+		resto.addDishToMeal(boulgour, meal1);
+		resto.addDishToMeal(pat�, meal1);
+		resto.addMealOfTheWeek(foodora, "meal1");
+		assertTrue(henry.getNbOfOfferReceived() ==1);
+		assertTrue(henry2.getNbOfOfferReceived() == 0);
+	}
+
+}
diff --git a/src/test/TestOrder.java b/src/test/TestOrder.java
index 460cc15..8a1d6c3 100644
--- a/src/test/TestOrder.java
+++ b/src/test/TestOrder.java
@@ -1,70 +1,70 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Item.Dish;
-import Item.FactoryDish;
-import Item.FactoryMeal;
-import Item.Meal;
-import Order.HistoricOrder;
-import Order.Order;
-import Others.Adress;
-import Others.Date;
-import Others.Period;
-import User.Restaurant;
-
-public class TestOrder {
-
-	@Test
-	public void testFinalize() {
-		Order order = new Order();
-		order.finalize();
-		int theDay = new java.util.Date().getDay();
-		assertTrue(order.getDate().getIntDay() == theDay);
-		assertTrue(order.isFinalised());
-	}
-	
-	@Test
-	public void testGetListOfOrderInAPeriod(){
-		Order order = new Order();
-		Order order2 = new Order();
-		order.setDate(new Date(2017, 04, 25));
-		order2.setDate(new Date(2017, 05, 25));
-		Date end = new Date(2017, 05, 05);
-		Date begin = new Date(2017, 04, 01);
-		Period period = new Period(begin, end);
-		HistoricOrder listOfOrder = new HistoricOrder();
-		listOfOrder.addOrder(order2);
-		listOfOrder.addOrder(order);
-		ArrayList<Order> listOfOrderInThePeriod = order.getListOfOrderInAPeriod(listOfOrder, period);
-		assertTrue(listOfOrderInThePeriod.size() == 1);
-	}
-	
-	@Test
-	public void testGetPrice() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
-		Order order = new Order();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		order.setRestaurantAttached(resto);
-		FactoryMeal factory = new FactoryMeal();
-		Meal meal = factory.createMeal("meal1", "FullMeal");
-		FactoryDish factory1 = new FactoryDish();
-		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
-		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
-		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
-		meal.addDish(dish3);
-		meal.addDish(dish2);
-		meal.addDish(dish);
-		order.add(meal);
-		order.add(dish3);
-		assertTrue(order.getPrice() == 19.25);
-		
-		
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Item.Dish;
+import Item.FactoryDish;
+import Item.FactoryMeal;
+import Item.Meal;
+import Order.HistoricOrder;
+import Order.Order;
+import Others.Adress;
+import Others.Date;
+import Others.Period;
+import User.Restaurant;
+
+public class TestOrder {
+
+	@Test
+	public void testFinalize() {
+		Order order = new Order();
+		order.finalize();
+		int theDay = new java.util.Date().getDay();
+		assertTrue(order.getDate().getIntDay() == theDay);
+		assertTrue(order.isFinalised());
+	}
+	
+	@Test
+	public void testGetListOfOrderInAPeriod(){
+		Order order = new Order();
+		Order order2 = new Order();
+		order.setDate(new Date(2017, 04, 25));
+		order2.setDate(new Date(2017, 05, 25));
+		Date end = new Date(2017, 05, 05);
+		Date begin = new Date(2017, 04, 01);
+		Period period = new Period(begin, end);
+		HistoricOrder listOfOrder = new HistoricOrder();
+		listOfOrder.addOrder(order2);
+		listOfOrder.addOrder(order);
+		ArrayList<Order> listOfOrderInThePeriod = Order.getListOfOrderInAPeriod(listOfOrder, period);
+		assertTrue(listOfOrderInThePeriod.size() == 1);
+	}
+	
+	@Test
+	public void testGetPrice() throws ExceptionUnknownMealType, ExceptionUnknownDishType{
+		Order order = new Order();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		order.setRestaurantAttached(resto);
+		FactoryMeal factory = new FactoryMeal();
+		Meal meal = factory.createMeal("meal1", "FullMeal");
+		FactoryDish factory1 = new FactoryDish();
+		Dish dish = factory1.createDish("Dessert", "pat�", "glutenfree", 4.5);
+		Dish dish2 = factory1.createDish("MainDish", "boulgour", "glutenfree", 5.5);
+		Dish dish3 = factory1.createDish("Starter", "soupe", "glutenfree", 5);
+		meal.addDish(dish3);
+		meal.addDish(dish2);
+		meal.addDish(dish);
+		order.add(meal);
+		order.add(dish3);
+		assertTrue(order.getPrice() == 19.25);
+		
+		
+	}
+
+}
diff --git a/src/test/TestOthers.java b/src/test/TestOthers.java
index 4049ec9..5a27a8f 100644
--- a/src/test/TestOthers.java
+++ b/src/test/TestOthers.java
@@ -1,27 +1,27 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Cards.BasicFidelityCard;
-import Cards.PointFidelityCard;
-import Others.Adress;
-
-public class TestOthers {
-
-	@Test
-	public void testIDCard() {
-		BasicFidelityCard card1 = new BasicFidelityCard();
-		PointFidelityCard card2 = new PointFidelityCard();
-		assertTrue(card1.getId() != card2.getId());
-	}
-	
-	@Test
-	public void testAdressFromString(){
-		Adress adress = Adress.fromStr("0.1,0.4");
-		assertTrue(adress.getX()==0.1);
-		assertTrue(adress.getY()==0.4);
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Cards.BasicFidelityCard;
+import Cards.PointFidelityCard;
+import Others.Adress;
+
+public class TestOthers {
+
+	@Test
+	public void testIDCard() {
+		BasicFidelityCard card1 = new BasicFidelityCard();
+		PointFidelityCard card2 = new PointFidelityCard();
+		assertTrue(card1.getId() != card2.getId());
+	}
+	
+	@Test
+	public void testAdressFromString(){
+		Adress adress = Adress.fromStr("0.1,0.4");
+		assertTrue(adress.getX()==0.1);
+		assertTrue(adress.getY()==0.4);
+	}
+
+}
diff --git a/src/test/TestRestaurant.java b/src/test/TestRestaurant.java
index 711c613..062adf3 100644
--- a/src/test/TestRestaurant.java
+++ b/src/test/TestRestaurant.java
@@ -1,175 +1,175 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import Exception.ExceptionUnknownDishType;
-import Exception.ExceptionUnknownMealType;
-import Exception.ExceptionUnknownStartegyType;
-import Exception.ExceptionUnknownTypeOfUser;
-import Item.Dish;
-import Item.HalfMeal;
-import Item.Meal;
-import Others.Adress;
-import User.Manager;
-import User.Restaurant;
-
-public class TestRestaurant {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testAddMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto.addDish("Starter","boulgour","vegetarian", 5);
-		resto.addDish("Dessert", "fondant", "regular", 7);
-		Dish pat� = resto.getDishByName("pat�");
-		Dish boulgour = resto.getDishByName("boulgour");
-		Dish fondant = resto.getDishByName("fondant");
-		resto.createMeal("meal1", "FullMeal");
-		Meal meal1 = resto.getMealByName("meal1");
-		resto.addDishToMeal(fondant, meal1);
-		resto.addDishToMeal(boulgour, meal1);
-		resto.addDishToMeal(pat�, meal1);
-		boolean isIn = false;
-		for(Meal m : resto.getListOfMeal()){
-			if(m.getName() == "meal1"){
-				isIn = true;
-			}
-		}
-		assertTrue(isIn);
-		
-	}
-
-	@Test
-	public void testAddDish() throws ExceptionUnknownDishType {
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		boolean isIn = false;
-		for(Dish d : resto.getListOfDish()){
-			if(d.getName() == "pat�"){
-				isIn = true;
-			}
-		}
-		
-		assertTrue(isIn);
-	}
-
-	@Test
-	public void testRemoveMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto.addDish("Starter","boulgour","vegetarian", 5);
-		resto.addDish("Dessert", "fondant", "regular", 7);
-		Dish pat� = resto.getDishByName("pat�");
-		Dish boulgour = resto.getDishByName("boulgour");
-		Dish fondant = resto.getDishByName("fondant");
-		resto.createMeal("meal1", "FullMeal");
-		Meal meal1 = resto.getMealByName("meal1");
-		resto.addDishToMeal(fondant, meal1);
-		resto.addDishToMeal(boulgour, meal1);
-		resto.addDishToMeal(pat�, meal1);
-		resto.removeMeal(meal1);
-		boolean isIn = false;
-		for(Meal m : resto.getListOfMeal()){
-			if(m.getName() == "meal1"){
-				isIn = true;
-			}
-		}
-		assert(isIn == false);
-	}
-
-	@Test
-	public void testRemoveDish() throws ExceptionUnknownDishType {
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		Dish pat� = resto.getDishByName("pat�");
-		resto.removeDish(pat�);
-		boolean isIn = false;
-		for(Dish d : resto.getListOfDish()){
-			if(d.getName() == "pat�"){
-				isIn = true;
-			}
-		}
-		assertTrue(isIn == false);
-	}
-
-	@Test
-	public void testGetSortListOfHalfMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto.addDish("Starter","boulgour","vegetarian", 5);
-		resto.addDish("Dessert", "fondant", "regular", 7);
-		Dish pat� = resto.getDishByName("pat�");
-		Dish boulgour = resto.getDishByName("boulgour");
-		Dish fondant = resto.getDishByName("fondant");
-		resto.createMeal("meal1", "HalfMeal");
-		Meal meal1 = resto.getMealByName("meal1");
-		resto.addDishToMeal(fondant, meal1);
-		resto.addDishToMeal(pat�, meal1);
-		resto.createMeal("meal2", "HalfMeal");
-		Meal meal2 = resto.getMealByName("meal2");
-		resto.addDishToMeal(boulgour, meal2);
-		resto.addDishToMeal(pat�, meal2);
-		for(Meal m : resto.getListOfMeal()){
-			if(m.getName() == "meal1"){
-				m.setNbOfSell(20);
-			}
-		}
-		ArrayList<HalfMeal> sortList = resto.getSortListOfHalfMeal();
-		HalfMeal mostSelled = sortList.get(0);
-		assertTrue(mostSelled.getName() == "meal1");
-	}
-
-	@Test
-	public void testGetSortListOfDish() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto1.addDish("Starter","boulgour","vegetarian", 5);
-		ArrayList<Dish> cartOfRestaurant = resto1.getListOfDish();
-		for(Dish dish : cartOfRestaurant){
-			if(dish.getName() == "pat�"){
-				dish.setNbOfSell(20);
-			}
-		}
-		ArrayList<Dish> sortList = resto1.getSortListOfDish();
-		Dish mostSelled = sortList.get(0);
-		assertTrue(mostSelled.getName() == "pat�");
-		
-	}
-	
-	@Test
-	public void testSetMealOfTheWeek() throws ExceptionUnknownStartegyType, ExceptionUnknownMealType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser{
-		MyFoodora foodora = new MyFoodora();
-		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
-		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
-		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		Restaurant resto = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
-		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
-		resto.addDish("Starter","boulgour","vegetarian", 5);
-		resto.addDish("Dessert", "fondant", "regular", 7);
-		Dish pat� = resto.getDishByName("pat�");
-		Dish boulgour = resto.getDishByName("boulgour");
-		Dish fondant = resto.getDishByName("fondant");
-		resto.createMeal("meal1", "FullMeal");
-		Meal meal1 = resto.getMealByName("meal1");
-		resto.addDishToMeal(fondant, meal1);
-		resto.addDishToMeal(boulgour, meal1);
-		resto.addDishToMeal(pat�, meal1);
-		resto.addMealOfTheWeek(foodora, "meal1");
-		assertTrue(resto.getMealOfTheWeek().getMeal().getName() == "meal1");
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import Exception.ExceptionUnknownDishType;
+import Exception.ExceptionUnknownMealType;
+import Exception.ExceptionUnknownStartegyType;
+import Exception.ExceptionUnknownTypeOfUser;
+import Item.Dish;
+import Item.HalfMeal;
+import Item.Meal;
+import Others.Adress;
+import User.Manager;
+import User.Restaurant;
+
+public class TestRestaurant {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testAddMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto.addDish("Starter","boulgour","vegetarian", 5);
+		resto.addDish("Dessert", "fondant", "regular", 7);
+		Dish pat� = resto.getDishByName("pat�");
+		Dish boulgour = resto.getDishByName("boulgour");
+		Dish fondant = resto.getDishByName("fondant");
+		resto.createMeal("meal1", "FullMeal");
+		Meal meal1 = resto.getMealByName("meal1");
+		resto.addDishToMeal(fondant, meal1);
+		resto.addDishToMeal(boulgour, meal1);
+		resto.addDishToMeal(pat�, meal1);
+		boolean isIn = false;
+		for(Meal m : resto.getListOfMeal()){
+			if(m.getName() == "meal1"){
+				isIn = true;
+			}
+		}
+		assertTrue(isIn);
+		
+	}
+
+	@Test
+	public void testAddDish() throws ExceptionUnknownDishType {
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		boolean isIn = false;
+		for(Dish d : resto.getListOfDish()){
+			if(d.getName() == "pat�"){
+				isIn = true;
+			}
+		}
+		
+		assertTrue(isIn);
+	}
+
+	@Test
+	public void testRemoveMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto.addDish("Starter","boulgour","vegetarian", 5);
+		resto.addDish("Dessert", "fondant", "regular", 7);
+		Dish pat� = resto.getDishByName("pat�");
+		Dish boulgour = resto.getDishByName("boulgour");
+		Dish fondant = resto.getDishByName("fondant");
+		resto.createMeal("meal1", "FullMeal");
+		Meal meal1 = resto.getMealByName("meal1");
+		resto.addDishToMeal(fondant, meal1);
+		resto.addDishToMeal(boulgour, meal1);
+		resto.addDishToMeal(pat�, meal1);
+		resto.removeMeal(meal1);
+		boolean isIn = false;
+		for(Meal m : resto.getListOfMeal()){
+			if(m.getName() == "meal1"){
+				isIn = true;
+			}
+		}
+		assert(isIn == false);
+	}
+
+	@Test
+	public void testRemoveDish() throws ExceptionUnknownDishType {
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		Dish pat� = resto.getDishByName("pat�");
+		resto.removeDish(pat�);
+		boolean isIn = false;
+		for(Dish d : resto.getListOfDish()){
+			if(d.getName() == "pat�"){
+				isIn = true;
+			}
+		}
+		assertTrue(isIn == false);
+	}
+
+	@Test
+	public void testGetSortListOfHalfMeal() throws ExceptionUnknownDishType, ExceptionUnknownMealType {
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto.addDish("Starter","boulgour","vegetarian", 5);
+		resto.addDish("Dessert", "fondant", "regular", 7);
+		Dish pat� = resto.getDishByName("pat�");
+		Dish boulgour = resto.getDishByName("boulgour");
+		Dish fondant = resto.getDishByName("fondant");
+		resto.createMeal("meal1", "HalfMeal");
+		Meal meal1 = resto.getMealByName("meal1");
+		resto.addDishToMeal(fondant, meal1);
+		resto.addDishToMeal(pat�, meal1);
+		resto.createMeal("meal2", "HalfMeal");
+		Meal meal2 = resto.getMealByName("meal2");
+		resto.addDishToMeal(boulgour, meal2);
+		resto.addDishToMeal(pat�, meal2);
+		for(Meal m : resto.getListOfMeal()){
+			if(m.getName() == "meal1"){
+				m.setNbOfSell(20);
+			}
+		}
+		ArrayList<HalfMeal> sortList = resto.getSortListOfHalfMeal();
+		HalfMeal mostSelled = sortList.get(0);
+		assertTrue(mostSelled.getName() == "meal1");
+	}
+
+	@Test
+	public void testGetSortListOfDish() throws ExceptionUnknownDishType, ExceptionUnknownStartegyType, ExceptionUnknownTypeOfUser {
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto1.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto1.addDish("Starter","boulgour","vegetarian", 5);
+		ArrayList<Dish> cartOfRestaurant = resto1.getListOfDish();
+		for(Dish dish : cartOfRestaurant){
+			if(dish.getName() == "pat�"){
+				dish.setNbOfSell(20);
+			}
+		}
+		ArrayList<Dish> sortList = resto1.getSortListOfDish();
+		Dish mostSelled = sortList.get(0);
+		assertTrue(mostSelled.getName() == "pat�");
+		
+	}
+	
+	@Test
+	public void testSetMealOfTheWeek() throws ExceptionUnknownStartegyType, ExceptionUnknownMealType, ExceptionUnknownDishType, ExceptionUnknownTypeOfUser{
+		MyFoodora foodora = new MyFoodora();
+		Manager manager = new Manager(0674, "jacques", 	"jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo");
+		manager.addUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,"1", "1", foodora,RESTAURANT,"Moral");
+		Restaurant resto1 = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		Restaurant resto = (Restaurant) foodora.getUserByName("Lataniere", "La tani�re");
+		resto.addDish("MainDish", "pat�", "glutenfree", 4.5);
+		resto.addDish("Starter","boulgour","vegetarian", 5);
+		resto.addDish("Dessert", "fondant", "regular", 7);
+		Dish pat� = resto.getDishByName("pat�");
+		Dish boulgour = resto.getDishByName("boulgour");
+		Dish fondant = resto.getDishByName("fondant");
+		resto.createMeal("meal1", "FullMeal");
+		Meal meal1 = resto.getMealByName("meal1");
+		resto.addDishToMeal(fondant, meal1);
+		resto.addDishToMeal(boulgour, meal1);
+		resto.addDishToMeal(pat�, meal1);
+		resto.addMealOfTheWeek(foodora, "meal1");
+		assertTrue(resto.getMealOfTheWeek().getMeal().getName() == "meal1");
+	}
+
+}
diff --git a/src/test/TestTargetProfitStrategy.java b/src/test/TestTargetProfitStrategy.java
index 5c4152f..06e09c7 100644
--- a/src/test/TestTargetProfitStrategy.java
+++ b/src/test/TestTargetProfitStrategy.java
@@ -1,146 +1,144 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import Core.MyFoodora;
-import DeliveryStrategy.ContextDeliveryStrategy;
-import Exception.ExceptionUnknownStartegyType;
-import Item.Dish;
-import Order.Order;
-import Others.Adress;
-import Others.Date;
-import StrategyProfit.ContextTargetProfitStrategy;
-import StrategyProfit.TargetProfitDeliveryCost;
-import User.Restaurant;
-
-public class TestTargetProfitStrategy {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testDeliveryCost() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(5);
-		foodora.setServiceFee(10);
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		Others.Date today = new Others.Date(theYear, theMonth, theDay);
-		int lastMonth = 0;
-		int yearOfLastMonth = 0;
-		if(theMonth == 1){
-			yearOfLastMonth=today.getIntYear()-1;
-			lastMonth = 12;
-		}
-		else{
-			yearOfLastMonth=today.getIntYear();
-			lastMonth=today.getIntMonth()-1;
-		}
-		Order order1 = new Order();
-		Order order2 = new Order();
-		order1.setRestaurantAttached(resto);
-		order2.setRestaurantAttached(resto);
-		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
-		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
-		Dish dish1 = new Dish("pat�", "regular", 56);
-		order1.add(dish1);
-		Dish dish2 = new Dish("boulgour","glutenfree",44);
-		order2.add(dish2);
-		foodora.getGlobalHistoric().getListOrder().add(order2);
-		foodora.getGlobalHistoric().getListOrder().add(order1);
-		double targetProfit = 20.0;
-		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("DeliveryCost");
-		foodora.setContextTargetProfitStrategy(newProfitPolicy);
-		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
-		assertTrue(foodora.getDeliveryCost() == 2.5);
-	}
-	
-	@Test
-	public void testMarkupPercentage() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(5);
-		foodora.setServiceFee(10);
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		Others.Date today = new Others.Date(theYear, theMonth, theDay);
-		int lastMonth = 0;
-		int yearOfLastMonth = 0;
-		if(theMonth == 1){
-			yearOfLastMonth=today.getIntYear()-1;
-			lastMonth = 12;
-		}
-		else{
-			yearOfLastMonth=today.getIntYear();
-			lastMonth=today.getIntMonth()-1;
-		}
-		Order order1 = new Order();
-		Order order2 = new Order();
-		order1.setRestaurantAttached(resto);
-		order2.setRestaurantAttached(resto);
-		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
-		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
-		Dish dish1 = new Dish("pat�", "regular", 56);
-		order1.add(dish1);
-		Dish dish2 = new Dish("boulgour","glutenfree",44);
-		order2.add(dish2);
-		foodora.getGlobalHistoric().getListOrder().add(order2);
-		foodora.getGlobalHistoric().getListOrder().add(order1);
-		double targetProfit = 20.0;
-		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("Markup");
-		foodora.setContextTargetProfitStrategy(newProfitPolicy);
-		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
-		assertTrue(foodora.getMarkupPercentage() == 0.1);
-	}
-	
-	@Test
-	public void testServiceFee() throws ExceptionUnknownStartegyType {
-		MyFoodora foodora = new MyFoodora();
-		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
-		foodora.setMarkupPercentage(0.05);
-		foodora.setDeliveryCost(5);
-		foodora.setServiceFee(10);
-		int theDay = new java.util.Date().getDay();
-		int theMonth = new java.util.Date().getMonth() + 1 ;
-		int theYear = new java.util.Date().getYear() + 1900;
-		Others.Date today = new Others.Date(theYear, theMonth, theDay);
-		int lastMonth = 0;
-		int yearOfLastMonth = 0;
-		if(theMonth == 1){
-			yearOfLastMonth=today.getIntYear()-1;
-			lastMonth = 12;
-		}
-		else{
-			yearOfLastMonth=today.getIntYear();
-			lastMonth=today.getIntMonth()-1;
-		}
-		Order order1 = new Order();
-		Order order2 = new Order();
-		order1.setRestaurantAttached(resto);
-		order2.setRestaurantAttached(resto);
-		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
-		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
-		Dish dish1 = new Dish("pat�", "regular", 56);
-		order1.add(dish1);
-		Dish dish2 = new Dish("boulgour","glutenfree",44);
-		order2.add(dish2);
-		foodora.getGlobalHistoric().getListOrder().add(order2);
-		foodora.getGlobalHistoric().getListOrder().add(order1);
-		double targetProfit = 20.0;
-		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("ServiceFee");
-		foodora.setContextTargetProfitStrategy(newProfitPolicy);
-		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
-		assertTrue(foodora.getServiceFee() == 12.5);
-	}
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import Core.MyFoodora;
+import Exception.ExceptionUnknownStartegyType;
+import Item.Dish;
+import Order.Order;
+import Others.Adress;
+import Others.Date;
+import StrategyProfit.ContextTargetProfitStrategy;
+import User.Restaurant;
+
+public class TestTargetProfitStrategy {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testDeliveryCost() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(5);
+		foodora.setServiceFee(10);
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		Others.Date today = new Others.Date(theYear, theMonth, theDay);
+		int lastMonth = 0;
+		int yearOfLastMonth = 0;
+		if(theMonth == 1){
+			yearOfLastMonth=today.getIntYear()-1;
+			lastMonth = 12;
+		}
+		else{
+			yearOfLastMonth=today.getIntYear();
+			lastMonth=today.getIntMonth()-1;
+		}
+		Order order1 = new Order();
+		Order order2 = new Order();
+		order1.setRestaurantAttached(resto);
+		order2.setRestaurantAttached(resto);
+		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
+		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
+		Dish dish1 = new Dish("pat�", "regular", 56);
+		order1.add(dish1);
+		Dish dish2 = new Dish("boulgour","glutenfree",44);
+		order2.add(dish2);
+		foodora.getGlobalHistoric().getListOrder().add(order2);
+		foodora.getGlobalHistoric().getListOrder().add(order1);
+		double targetProfit = 20.0;
+		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("DeliveryCost");
+		foodora.setContextTargetProfitStrategy(newProfitPolicy);
+		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
+		assertTrue(foodora.getDeliveryCost() == 2.5);
+	}
+	
+	@Test
+	public void testMarkupPercentage() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(5);
+		foodora.setServiceFee(10);
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		Others.Date today = new Others.Date(theYear, theMonth, theDay);
+		int lastMonth = 0;
+		int yearOfLastMonth = 0;
+		if(theMonth == 1){
+			yearOfLastMonth=today.getIntYear()-1;
+			lastMonth = 12;
+		}
+		else{
+			yearOfLastMonth=today.getIntYear();
+			lastMonth=today.getIntMonth()-1;
+		}
+		Order order1 = new Order();
+		Order order2 = new Order();
+		order1.setRestaurantAttached(resto);
+		order2.setRestaurantAttached(resto);
+		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
+		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
+		Dish dish1 = new Dish("pat�", "regular", 56);
+		order1.add(dish1);
+		Dish dish2 = new Dish("boulgour","glutenfree",44);
+		order2.add(dish2);
+		foodora.getGlobalHistoric().getListOrder().add(order2);
+		foodora.getGlobalHistoric().getListOrder().add(order1);
+		double targetProfit = 20.0;
+		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("Markup");
+		foodora.setContextTargetProfitStrategy(newProfitPolicy);
+		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
+		assertTrue(foodora.getMarkupPercentage() == 0.1);
+	}
+	
+	@Test
+	public void testServiceFee() throws ExceptionUnknownStartegyType {
+		MyFoodora foodora = new MyFoodora();
+		Restaurant resto = new Restaurant(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true);
+		foodora.setMarkupPercentage(0.05);
+		foodora.setDeliveryCost(5);
+		foodora.setServiceFee(10);
+		int theDay = new java.util.Date().getDay();
+		int theMonth = new java.util.Date().getMonth() + 1 ;
+		int theYear = new java.util.Date().getYear() + 1900;
+		Others.Date today = new Others.Date(theYear, theMonth, theDay);
+		int lastMonth = 0;
+		int yearOfLastMonth = 0;
+		if(theMonth == 1){
+			yearOfLastMonth=today.getIntYear()-1;
+			lastMonth = 12;
+		}
+		else{
+			yearOfLastMonth=today.getIntYear();
+			lastMonth=today.getIntMonth()-1;
+		}
+		Order order1 = new Order();
+		Order order2 = new Order();
+		order1.setRestaurantAttached(resto);
+		order2.setRestaurantAttached(resto);
+		order1.setDate(new Date(yearOfLastMonth, lastMonth, 12));
+		order2.setDate(new Date(yearOfLastMonth, lastMonth, 5));
+		Dish dish1 = new Dish("pat�", "regular", 56);
+		order1.add(dish1);
+		Dish dish2 = new Dish("boulgour","glutenfree",44);
+		order2.add(dish2);
+		foodora.getGlobalHistoric().getListOrder().add(order2);
+		foodora.getGlobalHistoric().getListOrder().add(order1);
+		double targetProfit = 20.0;
+		ContextTargetProfitStrategy newProfitPolicy = new ContextTargetProfitStrategy("ServiceFee");
+		foodora.setContextTargetProfitStrategy(newProfitPolicy);
+		foodora.getContextTargetProfitStrategy().execute(foodora, targetProfit);
+		assertTrue(foodora.getServiceFee() == 12.5);
+	}
+
+}
diff --git a/src/test/TestUserFactory.java b/src/test/TestUserFactory.java
index 264c4a9..3e6f3d5 100644
--- a/src/test/TestUserFactory.java
+++ b/src/test/TestUserFactory.java
@@ -1,42 +1,41 @@
-package test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-
-import Exception.ExceptionUnknownTypeOfUser;
-import Others.Adress;
-import User.HumanUser;
-import User.Manager;
-import User.MoralUser;
-import UserFactoryPattern.FactoryUserFactory;
-import UserFactoryPattern.UserFactory;
-
-public class TestUserFactory {
-	
-	public static final int UNKNOWN = 0;
-	public static final int COURIER = 1;
-	public static final int RESTAURANT = 2;
-	public static final int CUSTOMER = 3;
-	public static final int MANAGER = 4;
-
-	@Test
-	public void testCreateHumanUser() throws ExceptionUnknownTypeOfUser {
-		UserFactory factory = FactoryUserFactory.createUserFactory("Human") ;
-		HumanUser manager = factory.createHumanUser(0674, "jacques", "jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo", MANAGER );
-		assertTrue(manager.getTypeOfUser() == MANAGER);
-		assertTrue(manager.getName()=="jacques");
-	}
-	
-	
-	@Test
-	public void testCreateMoralUser() throws ExceptionUnknownTypeOfUser {
-		UserFactory factory = FactoryUserFactory.createUserFactory("Moral") ;
-		MoralUser manager = factory.createMoralUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,RESTAURANT);
-		assertTrue(manager.getTypeOfUser() == RESTAURANT);
-		assertTrue(manager.getName()=="La tani�re");
-	}
-	
-
-}
+package test;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+
+import Exception.ExceptionUnknownTypeOfUser;
+import Others.Adress;
+import User.HumanUser;
+import User.MoralUser;
+import UserFactoryPattern.FactoryUserFactory;
+import UserFactoryPattern.UserFactory;
+
+public class TestUserFactory {
+	
+	public static final int UNKNOWN = 0;
+	public static final int COURIER = 1;
+	public static final int RESTAURANT = 2;
+	public static final int CUSTOMER = 3;
+	public static final int MANAGER = 4;
+
+	@Test
+	public void testCreateHumanUser() throws ExceptionUnknownTypeOfUser {
+		UserFactory factory = FactoryUserFactory.createUserFactory("Human") ;
+		HumanUser manager = factory.createHumanUser(0674, "jacques", "jacquo", "jacques.martin@hotmail.fr", "123456789", new Adress(15.0, 10.0), true, "25/15/1955", "jacquo", MANAGER );
+		assertTrue(manager.getTypeOfUser() == MANAGER);
+		assertTrue(manager.getName()=="jacques");
+	}
+	
+	
+	@Test
+	public void testCreateMoralUser() throws ExceptionUnknownTypeOfUser {
+		UserFactory factory = FactoryUserFactory.createUserFactory("Moral") ;
+		MoralUser manager = factory.createMoralUser(0245, "La tani�re", "Lataniere", "contact@lataniere.fr", "1234", new Adress(10.0, 15.0), true,RESTAURANT);
+		assertTrue(manager.getTypeOfUser() == RESTAURANT);
+		assertTrue(manager.getName()=="La tani�re");
+	}
+	
+
+}
-- 
GitLab