fix userdata problems
Merge branch 'master' of github.com:avl/SwFlightPlanner
Merge branch 'master' of github.com:avl/SwFlightPlanner