resolve conflict
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3

Conflicts:
	model/process/OrderPayment_CreateTransaction.cfc
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
completed coding sorting in listing display
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3