Merge branch 'master' into Add-change-password-form

Realized salvation farms didn't have permissions to edit volunteers because of typo.  Fixed.