Modifications to login components. Added password field to User, which
is needed when registering a client.
Change to FlybookUI to get the JDBCConnectionPool
RegisterForm changes
java.lang.ClassCastException: com.vaadin.data.util.sqlcontainer.TemporaryRowId cannot be cast to com.vaadin.data.Item
'java.sql.SQLException: statement is not executing' when trying to register a user with identical information

Register works, but login does not. yet.
Why has password field been renamed passwd? rename it back to password?
Merge remote-tracking branch 'esahal/master' into merges

Conflicts:
	WebContent/flybook.db
	src/hlrv/flybook/AbstractMainViewTab.java
	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/auth/BCrypt.java
	src/hlrv/flybook/auth/Hash.java
	src/hlrv/flybook/auth/User.java
	src/hlrv/flybook/containers/AirportCountriesFSDelegate.java
	src/hlrv/flybook/containers/AirportGroupByFSDelegate.java
	src/hlrv/flybook/containers/AirportsContainer.java
	src/hlrv/flybook/containers/FlightEntriesFSDeletegate.java
	src/hlrv/flybook/containers/FlightsContainer.java
	src/hlrv/flybook/conv/CustomConverterFactory.java
	src/hlrv/flybook/conv/DateToIntegerConverter.java
	src/hlrv/flybook/db/DBConnection.java
	src/hlrv/flybook/db/DBConstants.java
	src/hlrv/flybook/managers/UserManager.java
Missed one block
Merge remote-tracking branch 'mats/master'

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/AirportGroupByFSDelegate.java
	src/hlrv/flybook/containers/AirportsContainer.java
	src/hlrv/flybook/containers/FlightsContainer.java
	src/hlrv/flybook/db/DBConnection.java