Merge pull request #257 from timschofield/develop

Develop
Merge pull request #258 from timschofield/develop

Develop
Merge pull request #259 from timschofield/develop

Update translations to the latest strings
Merge pull request #260 from timschofield/develop

Develop
Merge pull request #261 from timschofield/develop

Develop
Merge pull request #4 from KwaMoja/develop

Develop