UPDATED: a better flight.html
Merge branch 'zlk'

Conflicts:
	template/manage/flight/flight.html