-123456
Merge remote-tracking branch 'origin/master'

Conflicts:
	HorizonAirways/WebContent/SeatPicker.jsp
	HorizonAirways/src/com/px1/horizonairways/service/FlightReservationService.java