Merge remote-tracking branch 'jkrv/master' into merges

Conflicts:
	WebContent/flybook.db
	src/hlrv/flybook/AirportSelector.java
	src/hlrv/flybook/FlightDetailsPanel.java
	src/hlrv/flybook/FlightForm.java
	src/hlrv/flybook/FlightItem.java
	src/hlrv/flybook/FlightMap.java
	src/hlrv/flybook/FlightsTab.java
	src/hlrv/flybook/FlightsTable.java
	src/hlrv/flybook/FlybookUI.java
	src/hlrv/flybook/NewFlightDialog.java
	src/hlrv/flybook/SessionContext.java
	src/hlrv/flybook/auth/Auth.java
	src/hlrv/flybook/containers/AirportsContainer.java
	src/hlrv/flybook/containers/FlightsContainer.java
	src/hlrv/flybook/db/DBConnection.java
Merge remote-tracking branch 'jkrv/master' into merges
Merge remote-tracking branch 'mats/master'