Further work in CMA-ES algorithm.
Fixed conflict in CovarianceMatrixAdaptationEvolutionStrategy.java
Merge branch 'estebanpua-master'