Merge origin/master

Conflicts:
	src/db/ui/PassengerWindow.java