BROKEN COMMIT: Removed all samtest stuff and replaced back rotorcraft
Merge remote-tracking branch 'origin'