rename
some changes
Merge branch 'master' of https://github.com/antoinelavail/soa-integration

Conflicts:
	integration/src/main/app/misterDiscount.xml