fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/Flights/admin/links.php