Merge pull request #1 from JamesRoyPoulter/development

Development
Merge branch 'master' of github.com:JamesRoyPoulter/project_jac into development
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
resolved no conflicts
Merge branch 'development' into development_j