cleaner handling of comparators
Merge branch 'master' into distributed
temp commit
comparators are static
Merge branch 'master' into distributed
comparators are static
better use of stopwatch
new octojus -- multithreaded
get rid of grph
keep 10 best solutions
better goHome method
add acceptablePrice req
cosmetics
Merge branch 'master' into distributed

Conflicts:
	amadeus/src/dbparser/DB.java
	amadeus/src/journeyPlanner/Journey.java
	amadeus/src/journeyPlanner/JourneyPlan.java
	amadeus/src/journeyPlanner/Main.java
fix missing externalization of journeyplan + put timestamp in it
fix missing externalization of journeyplan + put timestamp in it

Conflicts:
	amadeus/src/journeyPlanner/Journey.java
add XRandom
fixes
Merge branch 'master' into distributed

Conflicts:
	amadeus/src/journeyPlanner/Journey.java
	amadeus/src/journeyPlanner/JourneyPlan.java
improved deployment -- only deploy to remote nodes