Add Payment Mock
Merge remote-tracking branch 'origin/master'

Conflicts:
	integration/src/main/app/flow_fedps.xml
Merge OK