Updated controllers
Merge branch 'master' of https://github.com/douglashughjackson/ProjectManagement.git