diff --git a/.gitignore b/.gitignore
index 239de2dc57e47706616e9f64c5a3b127da0b1896..60f78bb1b08421ce7ea80d4e6b49de3beb31983e 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 f37f18b45ded7ed6e55705a9cd08eae892c20a34..b24ca9daa7805d44976f9b5adbd25f82ffbe1856 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 66ae58ef2e7a96974168c91c1f7b7d4acb3c21b8..c98b9aa3493cfa37adffbacfe0ead9671041738c 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 1e4fc695772fb74dc8258ba7f781d38fe5c05a13..adb38eda725f24c7f7bf95b2ff58587f45aed452 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 d4acc3685870e3063d47e4a26105632bc47e761b..6d79fbb3c16fa2733938abdfbc4f9f99bfaf0b74 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 87db8949b62c0fec5a9de3a7c858bf334214b00c..b3515a91aef804e68c75be43e3e54198ce95b12f 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 ab355569d72ae3261bddc3b0ec2ffca9d563a417..96d295029b0f3ed2e0575ace75d77429dbd19a63 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 f243b49e2e980a1816d15b6dbef43e9ed813dda5..7d283046ee38eb20fdf76c6db08c08f8e38021dd 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 670560f6aeda58bded224f4eb372c87fdb90650c..748b0cc7220a5a54a13e90d87b700b935559ca92 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 75fbc28f17970cbf6bfa5be83c5a691b2da16f9d..7347d1ea4ef110f62ac3be27b318b8aaa7808e63 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 d72fd9e41ff4dda59f5ea8026707a3963c0a3a8f..2c1af6f1d442a5e34dac69a2341b744a5e0f7838 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 283ba3e4a88e383ba1d03ecfa9e16331a9eb55e8..541b6c8bfabc2f099d0504656b41f9924d651ff2 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 1f885ceecb91387380f8e0ece65066a21e854fd4..71914232f0e8aa307e348c5d952d7d479703ac18 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 e665123ea1d69783453e443c13ffaf38f6b44c17..58366d2d6b8e675146c4dc62e0bba6949f049eff 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 3e44198f8b05d6340548d90a75d6146464fe7709..7ab1cd1dbabecd23d6a3931345ef845f5b47e5b5 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 be0d2fc62302f7bb3b2f8e428ad5c2b7b875fd88..de8cca1e7a4583a435abc337b1ef7c189c235fbd 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 c0a80b8b69f00d5ac885870fc03ca052bebe2120..19e8e7182890ac69ba159dfd2f52635e01b79fb6 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 a2f933d0ec0928c8a2596ccb3a30e47837b0a5d4..fc6b037fd52bf3c06bf81af73a200b39b0c2c160 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 23b662213f9e10a535e10b4a2bd93678c85f43d7..d75d556b758ae10688765cdc1ec1595201411cd7 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 0000000000000000000000000000000000000000..4d7db845438a8b5d2711272b079da7e646b72a11
--- /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 7c3a6b51575d3144c525a02e0371c2abe7c154ce..77590496d7cde4ab900d1d0896a7214b84663557 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 1cfc8febb4ce77c619abcba75cfdef54161dc7d5..66c00a0aa195c2b8ab48a96ba4e29174ce1dd74b 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 0000000000000000000000000000000000000000..bd9c0b1c405d7282d5ab018cb1d3937693254f25
--- /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 0000000000000000000000000000000000000000..5df216bea510624ea853a3837077baba5e714034
--- /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 90fa012934633367c7efe12e50da3dfd8f1bd5c4..f8343edb0770bb94636871b2dc43b6a008d54599 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 0000000000000000000000000000000000000000..a8dd7f05a7111e71f945311249a2ffa2cd932a5d
--- /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 7d117b03e19805c6d84430276cc28ec94984adf1..b2f657d631657591a5c3533392d13c7c7d06a8ea 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 4a75e885556ba34180764bc544aafedd226179cf..8ea79a9c5045332128b57ea2164e922c2b71e3ab 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 0000000000000000000000000000000000000000..44c01e0cd873d1b8f0f0b1e117c8ba6e117e3f6b
--- /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 0000000000000000000000000000000000000000..702d6e8d580764be27f6ce3f77f128359433e4b9
--- /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 0000000000000000000000000000000000000000..7e73c555e2b161cf05ef0df81bb34b39e388245b
--- /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 0000000000000000000000000000000000000000..625f678146c22194daa32a2f1f73ccbf254d397c
--- /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 0000000000000000000000000000000000000000..a72b1418800624854a24199ff3dbd9b14e4cd577
--- /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 0000000000000000000000000000000000000000..42fcb55b4a8f996a46d863374b640c1b3ed86f90
--- /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 0000000000000000000000000000000000000000..77e3f5c466504b650d00ab51b5355feeb7bd3cbb
--- /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 0000000000000000000000000000000000000000..afd32cd91870e7c92f489f0de58ae2afa6503aab
--- /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 0c005ea9ee1781f2de07559c762319ea4932ab94..5958c3237a9b4c8d22154276f336a1cea0f1cffc 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 b0913cb35e7becfe6687dc12ab5ab918a903a765..4c526dbc128471a0fefbaeb31603c32684467755 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 52983d813e10fad805504cff382a8075adbcdde2..5a109990897cb123d38478459fe55f3b0aa3980a 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 c186937c693d115a475c7b009e5568106924d6b4..b2d53758ef52cde074aad98eecce1f9233a1c1ac 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 0000000000000000000000000000000000000000..3599076b1287f491bc4da8dbceb0e823019dec97
--- /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 0000000000000000000000000000000000000000..25408111529b9142896f66ab06c837be4aaab195
--- /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 0000000000000000000000000000000000000000..ee90258d667269fc7ce119bfd725d9368a4bf284
--- /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 0000000000000000000000000000000000000000..cb4f4e3133cd5c5b7297e870ef80d17da0baa0ac
--- /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 0000000000000000000000000000000000000000..0ff4c5f7e94b1cd7e3d7ce3979b72190ff3ef13e
--- /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 0000000000000000000000000000000000000000..bed71edbdcb944959b72d6221b4e7278bb4cf21c
--- /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 0000000000000000000000000000000000000000..7fe48b41d01ad5ba2ee0538d2ed8906c6fb8b05e
--- /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 0000000000000000000000000000000000000000..5f1d4c77abd3b3e30400ea5208ac54a83fe5c545
--- /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 0000000000000000000000000000000000000000..1abdeef222a30bd7991df8b37707bcb4d831e385
--- /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 0000000000000000000000000000000000000000..f6f8dd152e3d515e0588c9e5e4243ffb1da18d3e
--- /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 0000000000000000000000000000000000000000..eb69fc406a43a1baf3c14fd42233f5df7f3ef78b
--- /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 0000000000000000000000000000000000000000..f4163c024471a5aab63b7ac34a09b7e3069e4824
--- /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 0000000000000000000000000000000000000000..a0b044b408f918031f2849e199f470f5dee986ff
--- /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 0000000000000000000000000000000000000000..6971ef29f2604c6757797f97e69974d41aa1e2d2
--- /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 0000000000000000000000000000000000000000..589d30889d9302381beaba6677a51dab1b213782
--- /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 0000000000000000000000000000000000000000..4a6fda16d54d5ec7efedc986acb55cc0728b2925
--- /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 0000000000000000000000000000000000000000..81660e7ce1c07882a9dbc30ed4ba6e71e75da5d0
--- /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 0000000000000000000000000000000000000000..fd9389399b19e9d9bf26aad59f1b4e9e23456e05
--- /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 0000000000000000000000000000000000000000..a428b61671426bc7bf4a240c4c43d9403ae54103
--- /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 0000000000000000000000000000000000000000..13102b0608ce2ea8d9026a8f3b68fe212e011b94
--- /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 0000000000000000000000000000000000000000..2929724cb9fed772188c7d81b22a1a7dd0e8d7cb
--- /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 0000000000000000000000000000000000000000..179bbf72cd0c0aa49a632aaeeef9695eaded0194
--- /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 0000000000000000000000000000000000000000..271cd2d7a1e68821eecded8cc3f86f5cd456bf5c
--- /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 0000000000000000000000000000000000000000..c62475d50fda7bbb04a319e2b73da39ac0fe946b
--- /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 0000000000000000000000000000000000000000..937a0039281a98e111eee559f17cee014ea05061
--- /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 0000000000000000000000000000000000000000..3fcbf23cbd37f00ab1dad1cbcc9816c6e702aa6e
--- /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 0000000000000000000000000000000000000000..16631a6d23b5f96a4843dd57bd874e1ea71eb37a
--- /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 0000000000000000000000000000000000000000..160f970ac8ffe9a0644d0d6a50b570dd870089f1
--- /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 0000000000000000000000000000000000000000..a3d01613a701044c590de6ffbe768f7378d89b53
--- /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 0000000000000000000000000000000000000000..6d99f2680dfe1a73f161f470b8228782594f33fb
--- /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 0000000000000000000000000000000000000000..60e20a2b3aa36936d2cd424c3d8e6991f5bbbb87
--- /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 0000000000000000000000000000000000000000..31c32dafed25542c878dacf045daba862d2c4e51
--- /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 0000000000000000000000000000000000000000..3b19fb3affa9ae7d63e6484b5c4b10c92eb39154
--- /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 0000000000000000000000000000000000000000..b62210a4ca13e6c02633262df6c9db3981cff2e7
--- /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 0000000000000000000000000000000000000000..301730f9220dcd49318a525d0eb44f6f9dca8b78
--- /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 0000000000000000000000000000000000000000..5c075ac93e857621f681e8583fb53c6f503681d3
--- /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 0000000000000000000000000000000000000000..7e6cabd182b943227c040e1d1afcbbde1d7c433c
--- /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 0000000000000000000000000000000000000000..76769d5a682b22663ff4255ea60e29c03c01ee3c
--- /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 0000000000000000000000000000000000000000..ce9e56ef9442092185b2440ba390713359518051
--- /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 0000000000000000000000000000000000000000..210ff86c8f12f8eeb11430cc8549fdd79fda931a
--- /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 0000000000000000000000000000000000000000..a9bc7b581e31b24faf7898b31a4785116c22230e
--- /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 0000000000000000000000000000000000000000..0f09b57b3acd1c1fd0adb8d44501cfbfa5f1d9e7
--- /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 0000000000000000000000000000000000000000..611dda5ae156e157c19610af53d018499499c725
--- /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 0000000000000000000000000000000000000000..59ce5ef0efb6f40cfa8cd81e44971f7e05501ba5
--- /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 0000000000000000000000000000000000000000..386319233d3d6670f2acd00b7237815cbbc85c98
--- /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 0000000000000000000000000000000000000000..2625b3d629c226701fc8cc0a30945e867aa31dae
--- /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 0000000000000000000000000000000000000000..8b44c5c344a7d3203ac96642aede800b2bbc50e7
--- /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 0000000000000000000000000000000000000000..e3b6f38da83452d1b386ce425ad68d98965f1f11
--- /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 0000000000000000000000000000000000000000..cb960eb4a9b86e6ba2798179a4e4ab3d4ce59361
--- /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 0000000000000000000000000000000000000000..831282c7ef7b360348b48be8c782376b27c7416c
--- /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 0000000000000000000000000000000000000000..759c37418abc2d15b518273b9c8db35557de9daa
--- /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 0000000000000000000000000000000000000000..9b68c9f5a38f4e47d670fd9f0c1b1b734d0c6ca5
--- /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 0000000000000000000000000000000000000000..2d879576ac3dc13d9f15a192c82dff0906dfedbb
--- /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 0000000000000000000000000000000000000000..c1c5e2192610cbc48883a121cdf2f4460fd15cea
--- /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 0000000000000000000000000000000000000000..b378285baf5447f03646d279f34d5dd021e0de6a
--- /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 0000000000000000000000000000000000000000..f85e1e53f45b9fdc9d4f76fc7600031a60ee0e76
--- /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 0000000000000000000000000000000000000000..8d768e1806a48f5cd6c4608e7d634a420b7598e0
--- /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 0000000000000000000000000000000000000000..b9c79f34f2f1c9e7f4f5b6a1a8438a888e910af2
--- /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 0000000000000000000000000000000000000000..86d4d986face968b210f0107d02bba6a6264d921
--- /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 0000000000000000000000000000000000000000..1d9787f11e6b548521976ec17bed262516baac90
--- /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 0000000000000000000000000000000000000000..02ede60074ff74e68093a367fc0a4311acef359e
--- /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 0000000000000000000000000000000000000000..d22133082dd3add075dde160fba94f24cab21baf
--- /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 0000000000000000000000000000000000000000..2a8476a621831658b6a4526fed6c1c7c08760ad9
--- /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 0000000000000000000000000000000000000000..096ba716cfa17e59ea15b4468f5beb52b214b810
--- /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 0000000000000000000000000000000000000000..61d60adedfbdf979c8d057009bcb8d3967999903
--- /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 0000000000000000000000000000000000000000..979b8f3795bd65dcd9cca47036708ceed2bfa28d
--- /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 0000000000000000000000000000000000000000..1142fd75a289974d95941e4a9142c3a113da7ac5
--- /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 0000000000000000000000000000000000000000..4611cabe6cdddbf0a599fb270cd097f2eb6f8811
--- /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 f9b17f544f6e19d54a75b22d32664afbd1974b73..a461fe97d328f1a4faa2d387438011ce0baee3de 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 4a1e4a31a00a5cdc50ccbb5d5fbc5615ccdc1f52..4c179af13ef4e4886e5da00b73b740b574d3c389 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 0000000000000000000000000000000000000000..de96245bf456c9a7e2e3ec5c5ba9ba4c311aaac8
--- /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 3749b6d5d484afdc9a660d8dfa677f89ca1fd836..5e10343f41bae9e586b95952ef7692c4ef7e8f74 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 9db2118b40ab721a79fa1b36c370246be825d9da..ed25c384dffa55e0a5a25c9e453e701ec26a234e 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 d033db7674fafcb1d232a5ac23dce1e0407755cd..cda5dd176cd2c7ca5a4ea56d28d6512b99a71f3d 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 0000000000000000000000000000000000000000..7ab1fe80d7ee4c84eb372f27aa72d387938e14f9
--- /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 0e70b363bfff6363f94008986ea3bd01f3153b73..639ec4c84fed2c3a7ee36692552dc489c7c7bfd8 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 466192d25e42608a5d5c534065309ede758fedd4..8c9f622acc650758cb92ed64233edb37c49ed377 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 b2dabc183d86a05f7c60cb4e3445baa9b265605c..e82c3d16bd81329ca130d6beb31914e9e16cc41b 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 fc1b4dec42dccff86097cbdb1cb4aae349f799e3..20eaf2fda622997ab95eae583737a473670b1ff7 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 7a25c9cc187d4b74cb8de180a8b3e32029509fed..a9aa69d386a97e60566c3d7b7f6b207c629ca05b 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 76567b4e4b888994df1da7e6065ad00d7aea82f3..fa3ad57e2e1dcd9f69037f642b6c82ae63e1f7b4 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 25a3e98cc632d983d6b8b6d597c895cdf1eeec66..4fd1050431a27b8e3ad9499043650103a32714fa 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 c0acf50287724441d3216cd43f333ad3706c30c9..1039f19e3c23da32133102e0e9b9195e817db25c 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 e6fb72589d376a4d73308e7186608dda34a5fedc..eb87dbd5e7146858df52dfd390a2ec985a22a6f8 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 da148c9fd5f58d547396bcdc086c0cb73880f386..b818e88ea08623b02e36d16171db9b212b5d638b 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 cbf4cc2877bda2f36e9dbc81288f544b18c377af..c0994b6f7920e9edc86bfb1909fbeef2116638cb 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 96b093689bcd1783bd8af852d0db17243c442d4d..d5cbe72cd9f06cd4999a4a89c7e70166a3c9f39c 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 7d8711124ac3a8fef31d8b22c339987ee76568b7..bbaf39faab313003c44e92ad6a9b8f85a3b555df 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 eb2f576e519c22d23eb5e96619138628ad927cb4..91c2fd90940df9f5159ba77f0f4e2113be89baf2 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 f33589c41314cf54e67cff1671564d16dba79e44..e1f087c43232968f3775ac2a898a5d1a8b53e6f0 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 9050a9bd395e61fb517fdc08c58e2c3e803ede8f..8ad80f1ca0a1602ed7fdb02d1dea0a809ea3c901 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 2187c8025074f06bf54501ad628247dcb18ad9ed..9e1a9beadca73bd30ab829cf67d7b9c494887eda 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 2f97eec2a5a3d80b64925e23eeab2eb59ffbd4f3..f317ca0ec413c272e47232fd136b2e3b42b2267b 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 763cff515a5e169ebb8e42783418e75eb6125a35..6fefc9d4651bc741132d5d169de6519b18441b16 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 5025424d7d2b1b10ba0c43fa38dbfc55f7b4a590..bd6779c8a6f96ff092a60b4263e5a702937b2736 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 0000000000000000000000000000000000000000..b3b67b63292267685e1910b35cb5d8134bf85c61
--- /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 f9f3039e52bad35d0cd959ccb71de5fce485037a..37cef1a311344dd5939fc1d10787573b3cf4e061 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 8cdca1c00131dc4daa1d3b39dd1db44251d8e265..2e0e48218b0e72fe7a33e3df0c964ffb987a186a 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 71d8ec4b1f2e7c1a1505c6f7069f3bbb49238b56..124645852f9f9a6ce8405e600f59740551b902a5 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 0000000000000000000000000000000000000000..76160f983367499b6fd4ef7ede4d3efe8a3eda98
--- /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 536e5988ee11b40c550074ac1321cc037bd9513c..d0091b816b38fd33b800e16822a00a157fec973a 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 9e6107d4c940e185260700cd7c9993025314c83a..817f902c0cab277ed6fdf0ac28ded8581ab4dfaa 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 08d94f5048f3be9313768ec3a4a2bc1c8552121a..8cb8bd6f6e4a97ac907e385a2d6e26349e2aa0b3 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 5af5181a63cc7ee74011b2aec101d647c082f507..709e3cf1ab8f32582f3f6a5edec824439bf8500c 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 52ca41106bf860a1d2c2e10445ae42a5f7f41fa3..fa05abe8c75b00f379c1906315137f810d8c6e66 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 0ca026fd7fc1b6942eacc074bdeff13a5099143c..1e78de19b86ca5e910664fe55df450bc54be821c 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 f72b5cfff0eaecc27f923264a68759e20799e0aa..e1bd4fed91f6fdf8c033c204472c4aac58bb70a5 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 7a1aae63c01a4363e04c2f9e01a5f400c4653a0f..2978c82064c50effd43c249aae5a3052f2ba9b4f 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 039b790138d1138f9105601cef03dada4dee93a3..b39301807797e274697a0960c7e130760addadc2 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 027f3677d5ad6015a8b0137d5125aa6bc6f93894..fad876319b43d76db0aab75feaa6271938f18700 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 8e5ab54fe1bdf55a5a45cf7fcecdac38a6b904ae..301056b3e23c233d20a100f7e7383cda888f7a3b 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 60d1aef3fcb579fdcd524be2ce14d69c6ddd3d7c..dcfe5f276318c0c028d660144f96368dd28f3e52 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 021f8ddac04b354abb3330566d65b1b960a3c4ed..2e25d3a6406e73756662c99bd840a25c4cd5a5aa 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 99af29ba34e83bbfea9f928707aeea2c11a7f791..6e8926b21ff86315a4584b42d74d8fa733177217 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 81d2f38937eee3009bf434d67fba3809377efe11..6166396b74ee01e5993f330560b7836766dc7c9f 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 18cf413c6db8c559fc32394a2389133efe034835..c7d91d92d58a47f32356e6659c0e79cda8775de2 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 501167675d3ff2a18813e9b099f8ac6cc22c2577..04c0121e56fe3e82a8c65bad913bbdbe2a682c4f 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 58b0aa92620d980cd2f9cb0079d20695dd9c11c0..99c8a21d15b3323b01967e6a74dece976a2c9100 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 32dffcb63497cbf8d4cd876074b28c5cc18680ed..94afc526bc9dea37563757aa8c5361ca36e76e7a 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 8099dc8edd5cb13ad166cbc3644149e2379e9dbb..925ff3ae773c5f422d1e8f4140969959739e476b 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 b2a139b2f2f8b5f422f35a06808efa9d4dd4a8ef..8410df0e70739093c425c58e11d003f8ba1b4fed 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 04b77f99c341110525bb5eacec74e4887a662b4d..18105c50eabead4daa2920128966563d22e5a820 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 f71a2c91174a022a7805e3103dfd59f4f055337a..dbdf3932ebbcd14fdf7dad9cccf5bac481c4e0b8 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 82424153a10f462d5de6a7e4c74ecfda4adfcae6..ce6e74b0ca29ef1cb8c4d975522967bafb18cb2e 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 e8c3d1cd30d1222dedc64ff7eb0e65c5b3683709..e6f43375789e9d79612db262f7db22171f1ab16f 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 0afe7184fc797fe97db6a209cd05b9b31caf2eeb..0936d3af5d198f22151dbdf801cabd20c2bc44c0 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 9259d3807d02afcc8db808a170562ddc3551d4ee..99e181fc1dacd5b7b7636a42409e4a82aa177748 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 03720314705c95d37b22ef956c0058c60d51038a..0089f460184234c92273d31c1e082534e5a4b332 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 5717ed618bb458c94e9687a09c0bd45f0753ebaa..f48ae27dbdda3ad0cca83a02010b74afcf60f716 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 581074c0aa129b659eb283a205955428518d439a..2a4da61d17494ed55fdfa4de141b80fc6b4245b1 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 253a7dc421e168c503b60459ecb425ba4574f8f8..0347ceff00b288c77746e868389aa2b1ae2e8df4 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 c8f276469f08b64e7c773cf4ecaf69787c368798..4d98c1a9ebfe0b4e972345618ecb874e05483026 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 20dc99a93b465ca66e17804f42e8b3864dea37aa..7e311263ba7aa0a05592df5d27e9982cd0ba044d 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 85f20585b4130fb76b0e323e1c546e773cbd219b..c4b625d31479062e9eeaeef75dc9477bd7a3486c 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 0000000000000000000000000000000000000000..57b5bcb60fb8cc4c8870a24c0e6ddc8a66d735d4
--- /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 f9e58b832ecc31bfaba637695d7fe95887533f9f..52455160d5cab52f77d9617b0e5795ecf7a0090c 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 5dc9db3a1c3389bb94592dfa4c4293a99979d789..b1d11b28c3dbc28e3d2f4be04846132aeadbba3b 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 a9e14568b0931b7e801a0125ecfe922a9230e64f..52c14416384e2fed1fa3a9dcb3023913756f6f63 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 0000000000000000000000000000000000000000..19f220b3def0a3c1024ebfdebde2c00c6353c664
--- /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 666b6dea7ea1b9c18f80c6a3c98c12afa99f5011..f008dfe679cf57fb93411eed2d67d6e6312365b8 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 f04fca0cf94ea15f6458b2273a0794b7805b0431..2e65e5fa350a52bd90cc251f7acc19edce63e8a8 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 017bcd5f1b745f966a4b11ce9dd36d99a21a5e89..81e9a981d590fe814391cbea3ae59f112ef27031 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 bbcf4f062818fa7072d54001e96f6626304aa1f1..1215b5daac5e663b07b3b14c91afc5e8fb20abc5 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 db337d9d4175d15757fcebccfdec27f0b84883ce..c048875265ca4395f9c36690b4b6b20feff70cbd 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 eb129e58e8b0bb6a053ab03312737adfa1070041..c1b2b495d0dee9e2f0a852ce264464c97b773a96 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 706129a9a2a6ef6cc1f383ecefe1736cd71e77d8..70e9c441334303646ba475bdd7ebfee3f640a0e0 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 5d36e8db50c094b9ba680c107c27c74ddbff5711..c4c6efbf922fd5ecc13ab73f23096208a9abd64c 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 df335c9feaf658f7ded9bbbfaa3dcf2c48617802..eb9e189424054385e850b9ffdb2d969028fcbc7f 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 f9b618e0abe208e0fa8b7dabdb697cd1d8f60f06..f0aad5b1b3202dbccfc8f1f6aac12a218ff7d89f 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 b56c49d079623a0f3526ba2103d05114557d4078..4c45ba9772002c13924703869b2ba8df489d5274 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 135d5e806a18458b8ab621747bc2b0a277dc87bf..efc29c9666d34be40fdec3e08284861c22a665e5 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 c3f3cea18c253bc711305bcf0e67ad12d62c5900..41f634bc45a2deb7d114ef2f66c5abb71664013a 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 c6b116c608c9bb9f1fef07adb891d3b382388fb6..84900dd7274a7f8db4e5703b4d32cd0cba295805 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 57fde1577fc0b77b1f7f810cb58549b8806c720a..ca5a274698cdeb240bd613ed9803f4bff19d5e80 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 964811bbb0982b0367aa24c43697f1d61fae527d..9567aee9cb89e5d129476897b33fb9a41567d7ca 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 655d1a981c368682494968dda37391bf6bbe0236..8f451188d01409c8b8f3825922c42b90ce6279cd 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 0000000000000000000000000000000000000000..5682c53b4cbe56f98a3f8c188e0c7a0e88b3fb65
--- /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 5dd9669cd2e53963234d167b107a0e0bfa3237fa..420d007555861afeebd6c1ceb0d2fb6fa1be3188 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 41fcbf5865054dbc26c0aa7f9344ddc8345c8464..8ac49fe1ce39165710dc951ecdf00852b971aa93 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 1a54026f6b212ae88edf4b76a6769680b6eecd5d..ca6ec9ff0294c1f6c70faf1b5677dc45e151290a 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 a1cba3aa7e7ac520dbe4a07ca054f8eec5b7a276..6b4440dbbc8643899fd7f085aad80c6fac447010 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 54d586cc8e0d2bc8de48bea27b77833d9e46f236..beb0e6d3c40281da147ceb2a2f59807283a7c051 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 0000000000000000000000000000000000000000..b4e7ae24306cfc13a64ce58516b510fc60e8e47b
--- /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 c3673ae701a1e8a85a781209fd8bbf4cf3a76722..dc98c9622c0c890e22c748e91b52aef9d9145513 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 a00dcc2d937fbc3e88948a371e53d05eb539795e..bc49953dc0e5ba549aeaa8a4dbc897cc3d1d19a4 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 16ab18c467dd97fb6b38f26e79441b5fab8768b2..92aa57defa959a46ed48883986ef0d12a3b2310b 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 45c9a688af4c4bc70c4984433e1931fed58a20b5..071916d73774caf3296fda2c4fa3d2d28086405e 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 cb24d36a7c21cc0051fb382f1d48d5e1c619a40e..3738491af7e9f0457b2f0c21695b1e83d230eeb7 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 3517fccb30ba3bbf0de7ed46323a491502ce6dab..ac89e9c4a7a9acc97b6360a48ae54200d18cf3a6 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 4e77a7925af6b56849c024d97997eb24d31c4eef..d2d4c5960fd8dad0e7b60ac4d3d96cae0fe7eed1 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 71e3d0e0d3d4186b50519655a90e014a99b679ff..d94b6a32a3fff06b6cb706fbde74eabbb0d95d9c 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 1e975981b869e30ae0c20c1bb920c01dff8da0f2..b7315bf9ce69727b616af9af1450dbda43a27da1 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 3566c040da27d46b9955b5d784ca7745b97e4991..0b1275f0da4b0f6c4769eac5bb7263a376adb1a5 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 971cb8ad5184d4d51ca52de2af315900efb850ac..335a9da73089402f25a11c04fa1b285182cd8605 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 4c4236f2dc562c0431009fc9322bb8896b24327b..8b01f77b942b1d98ef9c7bf2307a2be74d583a47 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 2156caa5314dd6a478b2ac58b4137ce133376264..f3de061dc199ba330c173596c53a05a8bcfa3a21 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 07ee6b88d123601af79696ef27ebcb933e3a5fa6..ec0eabddf7a32729c2fca5783e36d955811251d3 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 cfb01d806b803d8015fd0a3f13032043533fc4f9..15416893c130c449b3a226d8ee9e141ff7add781 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 224668eb752890fdfb929035162d12569aa26f35..e173f5b9293df013477d261b0d87367c8631c347 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 a6c204ef5de4bba16b89b2cbee56d2231e1efa7f..8393263913019ccc50f903c224e8c42c4989e7c1 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 0db26e2feb298b0687a3efff893923060febee50..c7ddaab91408a51e482dace38262a420b1de508c 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 fb8b095b79456b4a4908a36645c83637ec49bbdf..224064300252df03666f656a4522686758e5d254 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 09b19577e3574ffe74b651e4bf51fe5780449260..888f1ca197503d605f4cdcec0b008b231e10321b 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 5d607a8c754215a2f899993b405602883597fe9f..feae62b483ad5fb327c8c21de54a5c7e64a11efd 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 14f408f79ae7764e9e1fab9b5375cf8245a7c388..6cbde11b1510a98242ead61b0750163f7f109ff0 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 8ff329e6df4aaccaffd102fa8a6e15cc6cbfdd13..f65e340ef012f9795f7f05a903bbd085a14b339f 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 05e375745aa663ec3eeafa8feed9877553da9078..074df56d36b6b9d2bae4980bb1dc886f63ecf99e 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 ba814fd889906426d5e2c7bea87b1108ecf6d866..1faee68e1d54cd325e4c3937c0152a2ae7853b00 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 0ee10e7905cb6666ecb14b95394726febd471c80..8927bf5711ef6968a6d3463ca9c968bbbfd20892 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 4cd1898f48f48849b27a8ade4231b7e55735601a..63d60c68aea5cc6cf350fc04a0ea3ab8cf714917 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 0a4f2db73f8a8d789a840ab580846f33c5b45e2f..9048b04db7b6f4e031dbe1f63eca99e4a08baaf2 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 e5f3c22ad99ab2729563d9d045ea31deafd6d254..50da611807a4c680c925699b4f1765f959ed3a7f 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 3c0035e95309d50ace7ce017f3a98683e24798b8..f0c00fc5057c98f3308bfce1a9a784015d845182 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 0000000000000000000000000000000000000000..93305d6226f4b62d6c8735c6f945dbab83fed7ee
--- /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 b4b0f6355ca00245e19b7acd2e3eace889917cb2..699604e06140831030de76596a98aaca6f39c477 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 ef028457390fd1bf5f4d7ef224111a4c374acee2..a366d14f89356d8e1a29cca06c5c139a62de3ef1 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 ea32d19c55fa00182de3660a286348f361ada602..48b80d8bc7658462ecf4dc045c49a49634109ae3 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 14766e7f3dfc55b5358de2e332ca1db0ab0be5ae..f97be82dcaac43fbb857d849c9bd04347d7df9d3 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 08c8da2e4f1e9d8e28ee3df7d119823f64cafa23..9cb9b8966de4b2a20ba02d9f6d21ff72a5f06e27 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 3becbd5eafad5a2325c83ffdc1f07658498e430b..5b0cabac4eb1ef7948321308d7117ef02df3aa96 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 b7bb5eadb0ef8af6fa03cd101a10821a64613469..e8896a9f4c88152d7088fde6b84d64809047add7 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 efcb123f74c0be673d37cad501bab286b6afa1a9..33b63521d8102919a4d821cff561b569105489c6 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 886273a937e7fa50e6e2dd5fc7f97b7e41305363..bfb45f93f971a3d297108bc1c07c0442a52ab383 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 0000000000000000000000000000000000000000..e131bbc314b0fc6da0e2c8f5ae81aa0d9e9b4146
--- /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 828b7ca4cc16d4f6f79db626a1f7413fe2a7b3c7..b631273f4339958b3413856669fbdbbd965b942c 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 e8bf52b49d387284a5f3e74b4843c1e12d3afdfb..c1da264a1063e910e1ee2722f8ee5ffe29943897 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 83163f411e6579888ac3f2a9a181c5ad059be73b..2c92d54497243b23312132fdc423a41856cc7cba 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 c502b315812d0ec81ddcc33d1ce763e0737e46de..b8123ad8d1a5de9649b109659de39300bfb25518 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 7f6a48b353305671e843268a67477eb174703341..1dec8cbe386d846729e22da4dd1c91b7b04fe5e3 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 b1ea24605542ca4d3efae15d7307d4bceabf2dc9..dd0c774bb2ca63e5e3f06bca6dbf0d5c0d6b039b 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 e7e4e1f2059c1415c4aea4eda66531f5c0432549..3762d5f22485cdb696dc1f43e3977ed2e1b91004 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 2ff3de529bd80de0993901b35fc5b6d24e5a7da6..cc43326f4bdee6abb4ae8e5586889774770214dc 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 3f84d90fed7ba92512f89c2e31c2285da48451ab..fefed1e2949e34b6748bc684190f812f510f3fd6 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 ddbdbf8872acf170ab992f1728f5624ac82aca90..ed4d8098cc091633fe172eba9ae91b16b11519f5 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 c0d1a683f84ae72623fd3bd2b231e11c063d27de..d436d6b052b98dc9bcacd59a84e988eaeab68306 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 49c4ccb75e7f5a3ed5132c4e63a99e46927024db..04f9fe998f5ddc9866ad448eed3db793575871a0 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 c049c793636c77c4a5096b2c7e21c4732d0a85dc..0da14c1dee686964e26ab0cc7e4d59289a9d9eaf 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 4a1a0944cea90ab5204964f10ade5fbed0fbf7ea..e6183e69f4290dfdd1761513e3f80888d0e074da 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 8992ca474bc7bd150327341033deb19717ae71dc..99a0db3a9c4afb3527b00423e615351cc0e784c8 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 f1a5516b140298789119ade8046d5e4cbb22211d..252094b2f3b48df356372ee1ea595585e88aba28 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 fca43244d15715940c5c0d6e4cada28d2464bad5..2af09061610ead795d012cedb5ba6ce9268d9e07 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 b4fc2446d106fd9c030febab4f1bad6af8800125..c5939c47837fc5f430d5208f6f035c4a6de9c9f3 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 d6a24cf02dbaeb4c52c1d58841eadc5f16b7eff0..8af55737d0426ddc56dbcf18773b0883b8be27ec 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 faa5b8aa31e19dc0bd6a394c5769b850397089ed..f9cbba1467672b27c5c1375dda12db9a52b249d7 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 39c805d45416b341c4b5732860e27fa10c5399b8..a79702ea082e1408f141128a707ebf420a3b79cf 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 be4da2af0bada0b68457892201f2e22ae06ed33c..a7d5984f722eff77d1c3c2044e30a55083f08711 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 608150606924b05c3ae3baa1b8d6c60f3410d7ed..dca7c9d83fc09ba99852b5b26d174c9351789328 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 4d4ba0c31507356f8dd0baaccc3669a6bd488411..cc988c932b00b98d9112467d3785401c9b7a6ca8 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 2093e9cd3cd5585a9528f96e88ee7ac18da3160e..2bb31e5a39de91158a9d51e6f993092926415bce 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 a955dda5c8ab128b213ac70810c30f2f1c9e9f87..4053574c744ffaa9ad614182094facb1f10c3954 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 0a36e08d64aafe5450a7287a14016657477b2619..23f01d45f02839bb6262f8ceac4e05c014b273b6 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 1bf543b6e0bc3632a8eb28e430065289e466dca2..369e03d5550145f0ee9482c070e5f24e0f017e47 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 24183371c6c8f7588aa7f76b35244180e5f51913..a1003dceaf158b76c589e0326ea42488d98924bd 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 a85dcddbf7ea1d137dab3dd3e50ecafc14852a70..c23d90b1c0b19d9e2a879d6c03e36c5c062248de 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 6a148361e0b1eb1966dc21507216d1218d8102f0..c3a4f07d50d8059ec0f323c67b44da7bb7a7c8ff 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 a24cf2ac106505091cdc292a2b0955cb9f4270f8..cd985a46f2bda64065e38afd316fabdcf1eef717 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 7be7e62aefed8c69eaf2e414eb2a457be16d1771..2f27dabe721f992e01263be46117fd017c0142eb 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 aaf823c3826e8beb0b8bc24c7c4660df5134cbb7..88ac1da8b8b2ee45a5792bdc266de2cffa750385 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 cc63aa3842389b873753c534d42de0606afbdc05..1f67977dd3a93efa9002ef7fec034dc9d23246e5 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 f2be06c3c10f4e5421c24ac694b58ec5a99129b9..3124cd40dc0f4c738566e9171dbfeb4390718a6d 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 719474b585d6042df03764b219ad2af00a374dcd..e56fd7f055a9d77166085e91bf8f6e4a216fb709 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 8312a49eeced2a86579697b34872e5606c193d04..28cf4c14d26ef229d6e49a16a2d2443e18cc5289 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 17f2ab93ce5cb7cfa1a3133f296f4fb73d2e8c54..a765f127d04c16bfc8f7d8cab0bae8cb4299cf5b 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 7d88f95fcc665c560a259693107a679f8e005ad9..45efa8ecd298c29dd0313f44cdf177b9fa8dc60c 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 3a1971b6a3ba1600f8ba53417445d5baa51c6f2a..78098a8111a1ae03b4aadcbe320ab8b1f7e10db8 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 138c00facd98d3803796e9099f0980d1c47a0646..51bea9d3c817134104cbd6667dc9b502d0edcf62 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 47281f03e82cc3778cd19644cd05f50829cc3f07..6891f918b3bd8dc54883ac3e9b543e9818c14ed2 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 7933d04eda3d97209670f0c5596d7538bbff3bc6..2a693fc2f9864f57cbe2f1ce5ccaad28dc47fbd7 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 7c644639e9e008c3322c4fc42c7a3fc2d23776bb..c6facf584c533f5587594438a3dddfd5dc06751b 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 d04be22f59d9f269a9be54de7069785d15f5928f..a304bb5dc880a7a2724b94b88a3df5d52148f984 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 e0971748f1c28ae62e032a8601c6f518e75da7c7..c725da44a95110a9262ef0e08e3ce52f33ca8b8c 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 8b1c64c094550a19dcb6fcd9cdb1c00d2a036640..f1c099c7c6a99af447a1c2971f7ec26f5b9d4065 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 372974a33048e9848e28117f19431bdb687d14bd..ee45d90d249000d1c0fc06817fbc25989415a49b 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 9da7c13a783f041ba7f80e5096b74a8726fb492f..0c0615b3a66174f0cd65768c5ea75c18bb198350 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 579336fae929d3875e6205654b2343098c6789e5..b63994ca5caef234b734f232e006bebe95aac7ca 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 ca6e2e4a2959af39baad052e83bdfad7fbda43fe..cf6f21d39430e19f337d492995669ddff171320d 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 a9a5cfe67667f4808167cfe82cbd2ca7b0ca2b00..5e337a2f668d925c86e6c89fe0d8b1e3119d57f6 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 ad2cba615af55618543960e969b2ccb59536effe..c3cb84f4425cc4dc78eff54cb7892d0bb6cfe83b 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 d7af0cc1de7d95aec58c8659ce0507eb1a2a8307..0b6eff35a119c5eef0433ec370683184342ec849 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 ad0503c1e647c1f0a10e95869e330e1e47591aa2..a03fdc7fd5c03ef9a3234cd3acdf46a8f2da9e25 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 e03140ab6f16f4c8d69b78ddeeed8cfa55b1d913..f6ef30dffbbfdb309bb8b5dd19688014555e00df 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 4ee0b97505d5caec3b8286fc7bd8a049d21bd381..f72c0c5ab14ed8f594a6dd99c0a3e4fb552db032 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 eae977b162a2cfdb943f94daf4347d382b81ef44..d00ff2873ceb332f2a47ffe2b22d25abb6776534 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 ddfadbe465111939032b2bfbaee600ebc83c869e..50913df23b3162120e7d9d573392581475b363fd 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 c7a30ffefc2a1efa8b565fdde0ea33543be3ac93..3309d4f59f7f0261be5f942715f1f935480f6f0a 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 7b71fc500f65953f4a97321d256c3a80c453ef59..dc0663cb1488b2666bd89cc1b665afbba0fd6e52 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 20b47da7527b2ee20c7ec0f49cc06528d1602898..15bd19e6fe9a682a7f87f16edc688bd46ea6f7f2 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 b34635693143ac308ba6d22c29554e5631f64b74..c3a1cae44d37b2e2b8c777cdc5c61321fc06af67 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 2febcf51e530a80b091955ebea15eb847f0fbd9d..6f19fb3016f1f040950e9abe71f1e72e28a3136c 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 98055b22d6d5bed7792d6857aa760cf914c62653..b8dad08913989c75cceea528e228757058cfc0a4 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 0000000000000000000000000000000000000000..65255ddacc817c43bd077f5bd57c17b9c237f125
--- /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 0000000000000000000000000000000000000000..19415f9767166fb38fd5c9b5bf13a54a73ca879a
--- /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 0000000000000000000000000000000000000000..02ce4547b42c1a1088ae2c458d50a72708b5aad4
--- /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 0000000000000000000000000000000000000000..abeb71f7f665527af5f4cc62c8abad52f6557f48
--- /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 0000000000000000000000000000000000000000..0042e3460425c97477be8b83d45d62df1dcd3366
--- /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 0000000000000000000000000000000000000000..67cd598567aab0fecc75a32b4050e93f22e28cb3
--- /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 0000000000000000000000000000000000000000..4b548eb7502765dc8c882ff94ee8124f220d3bb8
--- /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 0000000000000000000000000000000000000000..545119a8bf9a1c9e913f1f3926faadfc7b796547
--- /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 0000000000000000000000000000000000000000..51a06767458a55c0c36b3f1c11228b8b701a05e2
--- /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 0000000000000000000000000000000000000000..c5d0175725ff1ff61601c3ff3bf548b535645af9
--- /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 0000000000000000000000000000000000000000..f0798cf1483006c0763ee252dd2f2b78c83b5c0f
--- /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 0000000000000000000000000000000000000000..15fe3bbf54e2c2050ddadef3b44ebd1ad4133492
--- /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 0000000000000000000000000000000000000000..0294860ef145e64208482b02adcbfe5df9d92e21
--- /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 0000000000000000000000000000000000000000..867e885e7fd1381d84c3f24d50b1aca700ba3d7e
--- /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 0000000000000000000000000000000000000000..80d19f8a659aa5db1c25aef77f19a5a2fd1f1229
--- /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 0000000000000000000000000000000000000000..6d336bfeb69842a443e303053df90af9fbcfee87
--- /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 0000000000000000000000000000000000000000..f3310908b3541da4799f6fcd06a9f06f88496d38
--- /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 0000000000000000000000000000000000000000..da8655e33ad1757a939ef65461aab35137112318
--- /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 0000000000000000000000000000000000000000..00a5e0eb4c6b186835f426b297088bf71196a001
--- /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 0000000000000000000000000000000000000000..567c8044152684ed6267cde65a3cd729b3bb8e6e
--- /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 0000000000000000000000000000000000000000..44cfe8038f101f4fdb584e49c8afab223d77f4fe
--- /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 0000000000000000000000000000000000000000..e0fdd7f941bf1a7ce45a888e91e8744a4233a76f
--- /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 0000000000000000000000000000000000000000..295a630f70497c40431ad91731a6d37683c58100
--- /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 0000000000000000000000000000000000000000..e2be5c7ad36770309a39f2ec85f3911deb7d21b5
--- /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 0000000000000000000000000000000000000000..3bcbfadc316d48ae6137ec924f18fb987cb40604
--- /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 0000000000000000000000000000000000000000..44fde29382ffb53daacf194ddcde566f5cd3a244
--- /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 0000000000000000000000000000000000000000..a63fff4b2fc428a41a227df1f481291e13aaa84b
--- /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 0000000000000000000000000000000000000000..efea823d284b77207ba03151187ec73ad7284ef9
--- /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 0000000000000000000000000000000000000000..c3ae5ded02c3bcdbe733bc1f53154edfc30aca9d
--- /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 0000000000000000000000000000000000000000..7a51e1ac92d606ab789d24539b37e950256e5719
--- /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 4bad8f1dc5e92a1db503529286515679e44e8cd9..cfcf06ace49acd0fe9c84a216d945f75b294cf3f 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 595945fcbb1c531e8e4708038e69928f1421e186..fbdacf21fbcb1fcc6a408bd45aab567f4a50e454 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 15fec93589c60a785b80a573a8fdb08ff7393c48..a03282399fe19b2e41a531002467b029e26e09b4 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 d8837277d6e5fa40a8bfbf8e633b4ad11cf3c7af..231b79fc8315cee17a059b069f7e40ee950f050b 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 f7f614803e59d17a20c1ae51c1c56aea336362b8..89bc4b968b53cf776475463a21191b8c0b5dfbaf 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 2ee12529681c1202b2fab44a1039911000b7fc01..aa0f9592d435b032af75bb43ba1a1d45ed7f9f3d 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 dd2dacb906c11b995bc6b272a6577fab102fc4bf..378a1afaeb8dd9ef5a941a57af16ca88d9a753e7 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 45cd71f2a1aaeea1b244e72c0d62316c276b2a1a..d6e6c3229fa63580da3beff2162080706c48b3e9 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 1ba1f7c793c88594cd5267cd999d8f78cb69fdeb..726445f2172cab7e67d9f5dde4e2fa2f278c3b7e 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 48783c904f09203ebd9bf6e9521b0b80cec1be70..f564cd1c8b1f79040e6fa8f73f6c87f325bbf379 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 9fc75584e4a18a2eb0cf76fbc8f9ac8fc61732d4..990732c08c45fd71c9e8951360d628f0c62ec9ff 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 373e2e975568f941350278af509f70cb96452d57..13d31b4cf7a98fc6bcb9455e25b1ee5fd10ba437 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 2a6e3e7e2f0a90632141b9e148d33e590419eec6..810152d50e4b82d1fda085087ec5942049b39b25 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 a8683ea9d6fd6a08d0748f103d7301573a8e41d3..bf4333e19286f42d7512c0113af2937822ded71e 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 bfd33689e1d59fdcc4f54af3625235bbc0201413..0000000000000000000000000000000000000000
--- 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 e5486ab289cde60b4771c4c17e5ed52487c63e5e..521cd3cbf6d505db4bee332e72d086f6b5a1e907 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 740ada0a141afcdd8127ba3fc5eb60727025c00a..d8c9494f1a16b4ecd27ee5277525a51295cb804a 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 095903446d83ecf2e5abd9fcf16de4e1a81ae81d..fed6d873e178680459ace6a1e3f9435cf4256d9e 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 4c18d3c529389bb18e63aa88528dbd8132266ab7..5dafcd327ac7835a5cddc815f34f390ddf69cecb 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 b671be87f8f2324488a98d11df50b4e07694c802..fedefe293c74745ff607cc3c044be0cb62899984 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 be581f385c7c77123065de3b95afa223821660bb..68799dcd7e3fb6b84847f2a6b9e8d6572b810f2f 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 7ea13a8ec6136044b5034b9e8d9edf19134a0cd6..9cfc0fd590c968b4e92878ead9dcbc224898e0ce 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 b5417b3cd46bd15ad6f360e935afa583ba64035f..8ec6fae5781ba90168b87b7076f41c1c76abca4d 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 873607bb350957970705513156c479a9549caf90..cbdf67b8b9b0d54b42ecf137d2a37d47edca16a3 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 62c354874c5dd01684e6bf96ff32c52e98e1a037..3da8b751b3bbb78c916c9156b5a345eba01c229e 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 1e8f239f6f4f0639aa191455236d2af95764468a..3bde5d7f2d5d70dec784b75127434bcdef028aed 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 eba1a55bc784f30b841304bb8a00b5e31b4b8248..eb93832f08e4c74709ae79bf56956c9a07489f82 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 14a6a1063aa713d91e0e5f63d95d1b429800fcd5..59be8c01112fd0c880b49a9c93df03af654820f8 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 54424c252444fb5ff98afd1a0dbf51c0c0dcc691..802e885f352e0c7b0aab905805e98cf64bbb9bb6 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 e4f7bc494fa9b381ca0940a9d850493ddcf589ad..8e6cd7cfbb4d29cf5b214562e15f92bc09155bbc 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 f276a64c0d145eb94807d5a1df2f2461c019294a..5da66f6672c92b8c7a1573035d89500698d6248c 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 307014a093eb2f6a8dc2d25778cc190f1388a962..7aea053b974cf5e5d74d1336c7e76f3b52be2a41 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 88fac869c41ce9f298b5718238ca67a19d2e0b78..029f7d26e2b6f4b0c3655b56174881af650d32d9 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 6d7c87287f708a40670e0ff860775a4bb5fe4906..c24847e1f51862c4ff88be5ed7b324633e8a3926 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 660b8a54dcad56451dbbe2d227c1a6f87b7318cd..871a161f1216a4565a767cfad1aaf477d2cbbb60 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 99352b2bd13be62b6fe668b6346f275af9d99b96..d7cc7541c3fd27c6a8e76fe1b6295c7b58236f57 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 fa2657c37a837b2eafbe52e60c41a9f52abd8752..08951da15cec23cb5f689a45f50853ea1b4016b4 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 bb080186814512c5da85ba10308437fb8fcf5b25..0b2b62e193746c4b862635d7340f2914ee837ea0 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 f49cafdd9cd60ecad127bd42bba8c7bf665e03ba..9e265e9a85a7fc1962f44e73a96d7a413f341a28 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 a6350a55108f1449c25034ea726df5f96ab5af77..a616dbaa8922c9ecbce40b64b7cf4893462c1613 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 aee333360c7de7a0ef0fef9fdccb0aba1a72ed10..aa4f5aa645d3ae83ad14b44e4900915e52fedec1 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 1b0b93f791e54af820005b9c53a7de26e84c60d6..1755f038073614d8478be4c1f56be1bad8d75854 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 ef1301f6a243736ca2bc204133c405f062616c10..677e9a83b374abeb660daee2658246e25e25f64a 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 8bb0974c717d1fb2c67a251b8df411445217a367..7565d63d6d1083ed7189d821e5f477f55bf7f7a3 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 339d2af4c9451b1ab5f6a24bc0e2e4068f4a416f..4191f24a5df1055b7b572c4842b9ee1b9c82c972 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 a5dc0f2759263693fd4c9c742895958d4936a9f4..d20e996e4e8c196fb61ccb1d24d1d3a76c0552c5 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 ba4eab6cd250db509fa47f68ed4ce66899efe261..f3a66b1c7c4d00b562bb93e0e621bd6b563837dd 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 f06a99b352e719d8b7463924908710ebbce6a541..177f79c74f6ebe2c7d4fe864946e9a55bf3fee98 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 42e117937698e8750fc2f9f8d250e8cad59b5eea..7d127bc10bd9c524823cbea9dd8739004555552a 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 51694b7a95994e576200dc24ca96fb58fcfa4917..36200b1cf59dd1dc9352e3d1b4201e425f4cb715 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 9318d5b6411a523a587a4f9adbc11e24355476e7..8ff9d6c75deb6a63e63746c85094abe49ff4a5fd 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 d50a55f19411ca5d9d2f1b28df054bc7892a21b5..ce951dabb1d690935d4db4908494a47619234c6b 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 bf9abab340f5ecdf972f830c46f57d08d822d01f..0000000000000000000000000000000000000000
--- 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 cf3b4a47dc64a8bf8982f0c16b2bd941fa5f17b9..0000000000000000000000000000000000000000
--- 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 2dd5385ec5cf0cff17deb242cebb7363a9b3fb8b..0000000000000000000000000000000000000000
--- 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 2fab4152be88c621c9aadd8f440f5d938f6c4ec1..c4122264b2c757f1dcae417e0534bbd8109b642f 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 921f9fe8384f8f95557bdf52fc9746eb6ac38cbf..a5f7f1a4b594bae69aedfda8072a4c0684ac37aa 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 27f526a66212ff6ca4e397bd06c2bbe7960c2e51..dc2ac448da2ca6fde5c38b18e09e210b9ea6e4ac 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 7a742893044ce33f8e3e4c27bfbf07b9f2b50a5f..ad7bd1f94d128bee91d8024d4827c5712771d5d0 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 88a80bc0ff6267016ddf1cab2cb4f5c238947b30..0000000000000000000000000000000000000000
--- 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 391d98b20bd2f5d52b05f753ab5cbb2f5194ce65..4a01ee38e7a9a43ece59d573f4ed31c0d194f725 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 ce92f663accd4336c1ae377970b4c5c37be3f788..8b21c00444d7c310d4c4ff27cc33d60eca18f036 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 948dbfe1dbcda69bb1dfcf563ad7c21b0ad6bc1e..77e6062d90359e8ed89652e27aa1d53c37fb3163 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 e08b9a77e8cdbd1f29d0342c816a90354c38056d..ac2505c58209ab2aed44d66ceacd0065e7cbbd54 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 866da06f679554648df0faa4870a30a1c071f5f2..9cea0bc0227dba356edf5f832819d0fa435f6f0f 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 4f10522d46eacae416cc468805b8f01f55378958..05e6da5518c93a3df0e9f01531212445d27e0cd9 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 bca97018cd4605ed761f6bc5e146b1fb7f671c3d..82030b2fe93f867d622dad8ecf6f25aa0d4d9fe2 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 2e526cce52819645cc13d9e0b570c189fa383d13..f59bc7551835a5acdefeaa1e96402b28aa04c564 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 e6ec677d57c6771f2eea2b102b7352885882c936..3da9641f7d0f2dfb16766f0f59c06f21dfccef39 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 de047d48ca65d7532815751aa1447176ee1090f8..26adf483de9212e5d44c89cb4ac18343c6c593a7 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 1a5bd1c5a447462b64b64c1e1353b2917efa77f4..1e237f93836855be8367d453ed6b50e667922817 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 0ec0bb65c57dd62a6eb2a9beddf9551333dd985e..cc7a48f9ba98ae5cdee6a5004918e537e2e78ca3 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 862022616f1d906300eeb05ef79b10d366dce456..715ebc2124b8bc0ef2eae3f49e66881e65a2cb2d 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 2e781888692e16b51c7f7b8f3dbc3a810d988d34..6c7eb5c90f5fd08350b5755c879e10dd6be760ba 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 e9e5184a86c38f9e9328d8ba170152332a8be1e4..77fc1043a526e777317261994a64037aadb50185 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 75a6772832ef65d3e93f20c192074889fb20c0de..26ff192655e0fdf4ce916ebd996d3692c5fd7743 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 4952c24e649df2b5d236e8e952e40b98c8907bb4..a75e54acc0894531d9a2bcc98d030a48d6eabc3f 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 b456789a51aa31ce6775d8cd0b7e9b4ae2b7dadb..5fdff8a4b5b344dff5fc10a660ecacfe340c7950 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 06864d45081f93ea82cc316cea60db7e9cbfd685..a573cb2c02cdbca2cdc57e3beed3a99a91201019 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 a58851f0d82a741ff86cdbc138344bfb637f9861..dee16c11f03619294540cb9088c16d1331a68862 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 a6667c912e5fc3411d1147e03cb15db7262b2fd2..c9eb2f159ab2b0972be3994347c8e9611b699770 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 f02845ce71c56864a3ce3ca71557b4f7addb33ca..5812aeec049a03f63c34fc03bad23f04b688ca97 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 e3cf941151bd5095e75547e48c07410cbeb53983..e2e78549905fb08dc6bece0e75a383238fe6866f 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 1c9c35736d3df37f94a3c469f987c12badb96c71..73140f0ae14519ef799a2435654b0496a0101465 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 313b9081804b2892dd00e33c6cb50b1fb56eeb55..480cced6cb7a753666d5dcc609de923fbacafcc2 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 0bb6ec055b98e465425b39add1ee32ae84fa95c8..f54181100dc9a7cf6a9600ef413f20ca369b58ea 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 5fe6345433613d970b998f7e81a5d4fd04300b1d..4363577f4e8c6495bbe52c5dc9f00f3ad0d79620 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 d56852a773f5c8f57695cc78169ec40409b05aab..337bd946fb4a3b1806674902adb91af1327f5f12 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 f550fe6e664f11b7fe9ed35d3fffcf2ff145e217..361833ccc3f05fe086a0b490c34b01a058354ab5 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 ab362145dc749fa895223b9636c188d31fd6a604..02d0c8628e67ae0454346f30cd84e165ebf20bb0 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 e740b15d3fc9b7ee6135e57a00b2143e63f4bf0e..c3c30200b7cfff2d76c382b5fd4786f73fa20647 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 160000456d6c1bae4404ae730ac2cc6f78b9dbbd..0000000000000000000000000000000000000000
--- 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 3a887dc0eca91bac61b8777016899bc81d5e3530..1504d59cac0ec78a90c94a70b46b6113e3ccab3b 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 91ed5eb251a8e5897febc168782b82a805a1a8ad..0000000000000000000000000000000000000000
--- 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 45fce25daa36afce30fcca4eed120bf6d0c0cb94..ac0fc2e34b12f0acef2a984b0a11ecbfc53a4d9e 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 e5c52d4cf29ec13ff239b79cecbb0178e7bef852..ed138617ad79e163ccb952467350ec9fd99a2d62 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 55e1ad115944d571488247193dfe09f0ee9ed0a3..b4d6dfb41b8612c873196dd3ed1c618292023e42 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 4053d4c056621a612aea8075226395994d4c4aa6..f759d0cb8d8179e85813f12c18f46faab4e6a9e9 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 0c4dbb5d8e61d91bcce64936b282ad305f014515..0000000000000000000000000000000000000000
--- 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 c703064a8bab9e7206633bd8413af7b6f5d2d7d1..243398ff336f3987de912bef4061b0dc110eaaca 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 87b4743a14b09fe92107a64e29dddbb9f57df02b..b3adbf41020c52969ab08f691353f18c59397df1 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 262ef3b6709908dd2515e40a3103014b650e5262..82af0bbb2634ae1760d50ca685f51badc770b02a 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 b9c63a9c2f6221a09334a04eab832760667aa023..dd8a7bf0965b26555b1fba514fb1ef5691272f27 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 082cdb0b7c881b1065d4b21a4f7c83949976e13c..2c6d4eae9ffd340627443bbfc1cb2bae5ef480ad 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 e8db80bce337705b0c2b65db75c102b26e9f5344..7b12f68a75f64f7052f1cf9ccd2ba9b04500bfaa 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 452223d57428d46f9ed2cf505fcec2e66355a962..c939cb9efcd53f88e749effba5ca758d6d2f93f3 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 bf9abab340f5ecdf972f830c46f57d08d822d01f..8634d4c00e01da3a9ba292a8f51a6d39c79ee104 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 cf3b4a47dc64a8bf8982f0c16b2bd941fa5f17b9..134430ab06dcfea6798c93b45ba6bd8269c8374d 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 2dd5385ec5cf0cff17deb242cebb7363a9b3fb8b..7ceb24765619f8e9623346580db3cca68e768470 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 755e731dacda4a91ad1c7b85d74b1cebe5258a4a..621a073492b37941c435c6439cfc84d871657058 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 0b4a45781043bf9b06cb96a72da5085b803fd7ec..d330df831c5568910d813b6068d28b41d050aec5 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 4ef1c6c0e6c3088a4a42b60ca77a179312d4376b..2c9567affa8e9deab4a2728d522b0e3e9ad64582 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 c650e5283d3a8b3b984ef014fd1cc4f6b493a966..a2a97ec357d1059f5ec3cb9839719bae9e6cceb5 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 3d9d126d963e8f1d04e15396b8b76b98a0bd3822..d696d731c2cbed58345b10f96de4f657b1792601 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 2d5e715087d4eada9cb95aa5ef384f8a7cc9781e..df30fb5b1c1f2e7dc1d705daaf3078462e5dcca9 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 8faa6f4b8103ae5f44ea215433fa8f702bcd90d0..63b0254f9a031f732988c9a1e90b27785007cc1b 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 fc264849d1d19ebb55d02e9e54d3fff05ee1f21d..82af186eb04fba361f50f0e32dc26f55d598273d 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 d8b2b6b0e88387d0e1ca15130e88f08738cd70d6..992f73ff786254af85bdd3d49a5fb3267116db13 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 14118f43d544f815f7a80cfce26970add68cd188..911e0bce21d6a55578d33db7cce1eb77432238bb 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 460cc15f9a04150f8d1118850f2d0ff1c56e3990..8a1d6c3b067e1c153296f9762747011cb0588260 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 4049ec940dc223d7bec7feba4e547bfa995beb44..5a27a8f3a41d12c3c8407ec64fd2caeef2116fdc 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 711c6130b814b5dc75530de43f66837e6d247ad3..062adf3eb9ef87e42df162bcb6a79e880ae2fb6c 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 5c4152fff0d7416676290b01d8b55e8ab5b23f5e..06e09c7b4749ee2181a062abaaee684640764a20 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 264c4a9bbcf18e355850485af5f4059df269e060..3e6f3d518debc11516fe366385ef34b14429c012 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");
+	}
+	
+
+}