FlightServer: Controller implementation
Merge branch 'client'