Login
Merge branch 'master' of https://github.com/dramosti/Portal

Conflicts:
	HLP.Portal.MVC/Views/Shared/_Portal.cshtml
	HLP.Portal.MVC/bin/HLP.Portal.MVC.pdb
	HLP.Portal.MVC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	HLP.Portal.MVC/obj/Debug/HLP.Portal.MVC.csproj.FileListAbsolute.txt
	HLP.Portal.MVC/obj/Debug/HLP.Portal.MVC.csprojResolveAssemblyReference.cache
	HLP.Portal.MVC/obj/Debug/HLP.Portal.MVC.pdb
	HLP.Portal.v12.suo
dramosti