recommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/FindFlightsAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/FlightDetailsCaptureAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/PassengerManifestAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/PassengerSearchAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/ReservationCompletionAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/action/ViewReportsAction.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/da/FlightAircraftDA.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/da/PassengerReservationDA.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/daimpl/FlightAircraftDAImpl.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/entity/Passenger.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/entity/PassengerSeatPlan.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/entity/ReservedFlight.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/filter/IndexFilter.java
	HorizonAirwaysFinalProject/src/main/java/com/px1/horizonairways/service/FlightAircraftService.java
	HorizonAirwaysFinalProject/src/main/webapp/SeatPicker.jsp