Implemented and updated WorkspaceInstance and implemented some of the needed HTML generating code in the the doGet method in ProjectManagerComponent
fixed merge conflicts
fixed merge conflicts