better printout
better thread pool init
fix db init
Merge branch 'master' into multithreaded

Conflicts:
	amadeus/src/journeyPlanner/Journey.java
	amadeus/src/journeyPlanner/Main.java