Merge pull request #420 from timschofield/develop

Develop
Rename User.png file in the wood theme
Trap zero exchange rates in sales analysis updates
Change variable names
Merge pull request #421 from fahadhatib/develop

Develop