Modif + Supp + Prix total(marche mais a modifier)
Merge branch 'master' of https://github.com/daren511/DebarasBoileau

Conflicts:
	nbproject/private/private.xml