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

Conflicts:
	src/model/lookup/GeneticAlgorithm.java
	src/model/lookup/Lookup.java
	src/model/lookup/SimulatedAnnealing.java
	src/model/lookup/Tabu.java