Fix bug where freight charges were looked for when none exists
When deleting a user, delete also the locationusers related records to avoid orfaned info
Merge pull request #565 from timschofield/develop

Develop