Merge branch 'master' of https://github.com/ffiadmin/truefit-project

Conflicts:
	TrueFitProjectTracker/Views/Home/Project.cshtml
Merge branch 'master' of https://github.com/ffiadmin/truefit-project

Conflicts:
	TrueFitProjectTracker/Views/Home/Project.cshtml