Adding changes for UC4.01, UC4.02, UC4.07
Adding changes for UC4.01, 4.02, 4.07
Merge branch 'master' of https://github.com/benhejl/SWENG500_Team1

Conflicts:
	ProjectManager/ProjectManagerWeb/App_Data/ProjectManager.mdf
	ProjectManager/ProjectManagerWeb/App_Data/ProjectManager_log.LDF
	ProjectManager/ProjectManagerWeb/Site.Master