Merge branch 'delivery'

Conflicts:
	composer.lock
	install/insert.sql

templates/default/delivery_list.html

@@ -0,0 +1,15 @@
+{include file="includes/header.html"}
+
+<ul>
+{loop type="delivery" name="delivery.list"}
+    <li>
+        <ul>
+            <li>id : {#ID}</li>
+            <li>prix : {#PRICE}</li>
+            <li>Choisir : <a href="{url path="/delivery/choose/{#ID}"}">Choisir</a></li>
+        </ul>
+    </li>
+{/loop}
+</ul>
+
+{include file="includes/footer.html"}