EPP 5.2 changes
Merge branch 'master' of https://github.com/MOLEDesign/wwwPricingPlatform

Conflicts:
	administrator/components/com_pay/models/pays.php