Closes #942
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3

Conflicts:
	admin/views/entity/accounttabs/accountpaymentmethods.cfm