+
Merge branch 'master' of https://github.com/rzakirov/Smoker

Conflicts:
	StroiServ.v11.suo