fixed model associations and flights
Merge branch 'master' of https://github.com/drej2k/Flight-Manager-WebApp