Some changes added on Payment
Some changes added on Payment
Some changes added on Payment
Merge origin/origin into origin

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.xml