Changed ProjectOwner/Staff relationship to User

ProjectOwner/Staff no longer inherits from User. Instead, a one-to-one
relationship has been established

*also includes code formatting