Merge branch 'pending-logproba'

Conflicts:
	JavaCLTutorial/src/main/java/com/heeere/dpgmm/javacl/GibbsSampler.java
	JavaCLTutorial/src/main/opencl/com/heeere/dpgmm/javacl/GMMKernels.cl
	PYGMMScala/src/main/java/com/heeere/pygmmscala/Main.scala