Adding cardflight
Merge pull request #5920 from CardFlight/master

Adding cardflight