fixed bug when deleting account address query referenced old table name
SlatwallOrderFulfillment, changed to SwOrderFulfillment
fixed bug typo in public account.cfc controller for deleting account
payment method. it was using accountPhoneNumber as the entity
fixed typo in CommentDAO.cfc renamed hqlPrarms references properly to
hqlParams. the variable was also unscoped and has now been scoped
properly as well.
Started mapping out cache service.
Fixes issues with making sure that credit card numbers get encrypted
when the payment method is flagged as such.
Fixes extra space in outputs
Payment integration for Click & Buy
Payment integration for 1&1 iPayment
Fixed and verified encryption, as well as an authentication fix.
Updated Version 3.1.25
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-ipayment
Updated Version 3.1.25.066
Merge branch 'develop' into feature-clickandbuy
Updated Version 3.1.25.067
Merge branch 'develop' into develop-bugfixes
Updated Version 3.1.25.068
Added Order Dates as dimensions and updated version 3.1.25.069
Updates to automatically cancel subscriptions if they are returned.
Important bugfix creating deliveries, and updated version 3.1.25.070