Unzip
Merge remote-tracking branch 'origin/master'

Conflicts:
	ItShop/ItShop.ConsoleClient/bin/Debug/ItShop.ConsoleClient.exe
	ItShop/ItShop.ConsoleClient/bin/Debug/ItShop.ConsoleClient.pdb
	ItShop/ItShop.ConsoleClient/obj/Debug/ItShop.ConsoleClient.pdb
	ItShop/ItShop.v12.suo