kiran
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal

Conflicts:
	src/main/app/kiran-saop-customer-order-data.xml
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal

Conflicts:
	flows/SupplierKiran.mflow
	src/main/app/kiran-saop-customer-order-data.xml