сгенерирован angular project
Merge branch 'master' of https://github.com/DrNorton/GiftKnacksProject

Conflicts:
	GiftKnacksProject.Api/GiftKnacksProject.Api.v12.suo
	GiftKnacksProject.Api/GiftKnacksProject.Site/.ntvs_analysis.dat