Merge pull request #486 from timschofield/develop

Develop
Merge pull request #487 from timschofield/develop

Develop
Merge pull request #488 from timschofield/develop

Develop
Merge pull request #489 from timschofield/develop

More work on making all variable names pascal case
Merge pull request #490 from timschofield/develop

Improvements to the security of the login process
Merge pull request #491 from timschofield/develop

Develop
Merge pull request #492 from timschofield/develop

Develop
Merge pull request #493 from timschofield/develop

Develop
Merge pull request #494 from timschofield/develop

Develop
Merge pull request #495 from timschofield/develop

Develop
Merge pull request #10 from KwaMoja/develop

Develop