Changes to project class, and a bunch of line break madness
Forgot to add project class files
Merge branch 'feature/projects' into dev