Update
Merge branch 'master' of https://github.com/iAF/iAFWeb

Conflicts:
	iAFWebHost/Views/Shared/_Layout.cshtml