multiple payment options, RT#23741
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	FS/FS/cust_main.pm
Merge branch 'master' of git.freeside.biz:/home/git/freeside