Merge branch 'develop' of https://github.com/tearne/Sampler.git into
develop

Conflicts:
	sampler-core/src/main/scala/sampler/r/QuickPlot.scala
Merge branch 'develop' of https://github.com/tearne/Sampler.git into
develop