Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal
ajout printed catalogue
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal

Conflicts:
	src/main/app/PGD_ProcessingOrders.xml