fix for Issue #1615 password in email
Merge branch 'master' of github.com:rideconnection/clearinghouse