updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectManagementSD18/ProjectManagementSD18/Views/Shared/_Layout.cshtml
Merge branch 'master' of https://github.com/douglashughjackson/ProjectManagement