Further refactoring in CMA-ES algorithm.
Further refactoring in CMA-ES algorithm.
Changed sort method to JDK 7 compatibility
Resolving conflicts in CMA-ES