korzina, ne zakonchena
korzina pochti gotova
Merge branch 'S2-Buy' of https://github.com/sergeysah/Netping_modern into sergeysah-S2-Buy

Conflicts:
	NetPing_modern.v11.suo
	NetPing_modern/Views/Catalog/Index.cshtml
	NetPing_modern/Views/Product_item/Index.cshtml
	NetPing_modern/Views/Shared/Header.cshtml
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
Merge branch 'sergeysah-S2-Buy' into S2-Buy
fix price
Merge remote-tracking branch 'origin/master' into S2-Buy

Conflicts:
	NetPing_modern.v12.suo
	NetPing_modern/Views/Catalog/Index.cshtml
	NetPing_modern/Views/Shared/Header.cshtml
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Debug/NetPing_modern.dll
	NetPing_modern/obj/Debug/NetPing_modern.pdb
	NetPing_modern/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	NetPing_modern/obj/Release/NetPing_modern.csproj.GenerateResource.Cache
	NetPing_modern/obj/Release/NetPing_modern.dll
	NetPing_modern/obj/Release/NetPing_modern.pdb
change
User guide icon has been added
Expandable text in the description
Merge pull request #26 from kuljok/S3-bugs

User guide icon and expandable text
add public method
Fixed lists on the short descriptions

fixed JS issues on the main and catalog page
Fix dealers page
Fix View page layout

Change layout of images and headers
fix an issue with js error on main and catalog page
Sorting of Terms
Merge pull request #30 from kuljok/dealers-ordering

Sorting of Terms
Revert "Sorting of Terms"

This reverts commit 9393493ab8faf11193a08eed09211582b9a8e732.
Merge pull request #27 from kuljok/lists-feature

Fixed lists on the short descriptions
Merge branch 'fix-dealers' of https://github.com/kuljok/Netping_modern into kuljok-fix-dealers

Conflicts:
	NetPing_modern.v11.suo
	NetPing_modern/bin/NetPing_modern.dll
	NetPing_modern/bin/NetPing_modern.pdb
	NetPing_modern/obj/Release/NetPing_modern.csproj.GenerateResource.Cache