Securite et Gestion commande beta
Merge branch 'master' of https://github.com/BasToS81/coni

Conflicts:
	src/main/resources/application.properties
	src/main/webapp/famille/profile.html
Page Commande + Accueil
Page accueil.html + commande.html