Fixes css merge conflict
merge conflict fix
Merge remote-tracking branch 'lorenz/integration_merge'
PFD crash on start bugfix and rename to .cc
merge Lorenz
Merge remote-tracking branch 'lorenz/master'
PrimaryFlightDisplay now receiving UAS added/removed signals
Merge pull request #301 from dongfang/master

Bugfix (missing updates): PrimaryFlightDisplay now connecting to UASCreated and UASDeleted signals.