after merge with alex code
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Utilities/Order.js
	routes/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Utilities/Order.js
	routes/index.js
	views/index.jade
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.jade
F7 - complet
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/demandeLivraison.js