merge?
Merge branch 'develop' of github.com:theraphim/scala-dispatcher into develop

Conflicts:
	src/main/scala/problems/Problem.scala