new
Login and Client fixed (views)
Merge branch 'fieldswork' of https://github.com/CST4G/HealthAppSprint2b into jon-merge

Conflicts:
	HealthApp/Views/Login/Edit.cshtml
	HealthApp/Views/Services/AddServices.cshtml
	HealthApp/Views/Tasks/Index.cshtml
	HealthApp/Web.config