Merge remote-tracking branch 'origin/master'

Conflicts:
	ajouterProduit.php
	iframepanel.php
Merge pull request #9 from papymojo/ep_graphique

Merge remote-tracking branch 'origin/master'