Merge origin/master

Conflicts:
	src/pi/bestdeal/gui/UI_supprimer_deal.form
	src/pi/bestdeal/gui/UI_supprimer_deal.java
Merge origin/master
Merge origin/master

Conflicts:
	src/pi/bestdeal/gui/UI_supprimer_deal.form
	src/pi/bestdeal/gui/UI_supprimer_deal.java