Merge pull request #436 from timschofield/develop

Develop
Correct problems relating to updating translations of item descriptions
Thumb: Fixed missing discount modifier bug
aDD SALESMAN LOGIN CONTROL
Merge pull request #437 from fahadhatib/develop

Develop
Merge branch 'develop' into payroll