Merge remote-tracking branch 'origin/master'

Conflicts:
	ajouterProduit.php
	iframepanel.php
iframe