tests for category and user finished
resolved non-conflicts
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development