fix : override city.hashCode to use cities as map keys!
compare against k-th best, not against the best
collecting/serializing solutions, computing results
dramatically improve memory footprint: intern() on all new strings!
better handling BD reads from file and checkup
fix timeslot generation
dramatically improve memory footprint: intern() on all new strings!
better handling BD reads from file and checkup
fix timeslot generation

Conflicts:
	amadeus/src/journeyPlanner/Journey.java
better generation of test cases
better generation of test cases
Merge branch 'master' into distributed

Conflicts:
	amadeus/src/journeyPlanner/Main.java
fix protocolbuf hotelblob parsing
always deserialize cities taking their unique instance from DB (but in Main)
Merge branch 'master' into distributed