[bug 2838780] fixed bug where category is lost when tag selected
[#2838685] Custom Page for Error 404
Merge pull request #81 from kuljok/bug_lost_category

[bug 2838780] fixed bug where category is lost when tag selected
Merge branch 'cr_2838685_404' of https://github.com/kuljok/Netping_modern into kuljok-cr_2838685_404

Conflicts:
	NetPing_modern.v11.suo
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/NetPing_modern.csproj.FileListAbsolute.txt
	NetPing_modern/obj/Debug/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
Merge branch 'kuljok-cr_2838685_404' into S5-iter2
Merge remote-tracking branch 'origin/S5-iter2'

Conflicts:
	NetPing_modern/Content/Data/netping.xml
	NetPing_modern/Views/Shared/Blog_master.cshtml
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb