update
Merge branch 'master' of https://github.com/ryzins1/PropertyManager

Conflicts:
	MvcApplication/Views/Home/Index.cshtml