Change column in flight table for flight number to integer
Merge with current master