non functional part done
updating with master #83 #84 #127
Story done #83 #84 #127
UMLs #83 #84 #127
fixing uml #83 #84 #127
fixing UMLs #83 #84 #127
fixing uml
resolving conflicts #83 #84 #127
fixing indentation #83 #84 #127
fixing indentation #83 #84 #127
fixing indentation #83 #84 #127
fixing indentation #83 #84 #127
Merge pull request #317 from ndomar/C1_ProjectsPage

C1 projects page