a
a
Merge branch 'lee_edit' of github.com:satzcoal/GJD into lee_edit

Conflicts:
	app/models/info/customer_finance.rb