Daily commit
Merge branch 'master' of https://github.com/qpiny/Solver

Conflicts:
	src/main/scala/org/rejna/solver/Dispatcher.scala
	src/main/scala/org/rejna/solver/Worker.scala
Daily commit