include Flarm features in master

don't expect this to be merged soon happen soon