connexion
Merge branch 'master' of https://github.com/matthieurobin/gestionStocks

Conflicts:
	installs/install01/include.php
Merge branch 'master' of https://github.com/matthieurobin/gestionStocks