azdzd
Merge branch 'master' of https://github.com/LachezarTomov/TelerikDBTeam

Conflicts:
	ItShop/ItShop.sln
	ItShop/ItShop.v12.suo