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

Conflicts:
	www/_/js/menrva.js