Fix conflict in merge

...in/java/be/cylab/java/wowa/training/AbstractSolution.java

src/main/java/be/cylab/java/wowa/training/Example.java

src/main/java/be/cylab/java/wowa/training/Factory.java

src/main/java/be/cylab/java/wowa/training/SolutionAUC.java

...in/java/be/cylab/java/wowa/training/SolutionDistance.java

src/main/java/be/cylab/java/wowa/training/Trainer.java

src/main/java/be/cylab/java/wowa/training/Utils.java

...ava/be/cylab/java/wowa/training/SolutionDistanceTest.java

src/test/java/be/cylab/java/wowa/training/TrainerTest.java