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

Conflicts:
	HorizonAirways/WebContent/SeatPicker.jsp
	HorizonAirways/WebContent/cancel.jsp
	HorizonAirways/WebContent/passengerdetails.jsp
as
Merge remote-tracking branch 'origin/master'

Conflicts:
	HorizonAirways/WebContent/passengerdetails.jsp
	HorizonAirways/WebContent/thankyou.jsp