remove association
Merge branch 'clickandbuy' of https://github.com/semnetgmbh/Slatwall.git into clickandbuy

Conflicts:
	integrationServices/clickandbuy/Payment.cfc