Merge branch 'master' of https://github.com/AlekseiIvshin/work

Conflicts:
	XSD/products.xsd