merge
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment.git

Conflicts:
	.project
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment.git

Conflicts:
	scripts/baseService.js
merge
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment.git

Conflicts:
	scripts/baseService.js