M
Merge github.com:GorshkovNikita/vizant-market

Conflicts:
	.idea/workspace.xml