Merged ABCmethod evolveOnce tests
Merge branch 'develop' of https://github.com/tearne/Sampler into develop

Conflicts:
	sampler-core/src/test/scala/sampler/abc/ABCMethodTest.scala