Fix errors in worker
Merge branch 'master' of github.com:Vladimiroff/regularity

Conflicts:
	factory.h
	main.cpp
	order.h