passenger details servlet
Merge remote-tracking branch 'origin/master'

Conflicts:
	HorizonAirways/WebContent/WEB-INF/web.xml
cancel jsp servlet
as
Merge remote-tracking branch 'origin/master'

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