Merge branch 'master' of github.com:pierrebinauld/Journey

Conflicts:
	src/benchmark/impl/GeneticBenchmark.java
	src/benchmark/impl/TabuBenchmark.java