Disabled sonar in airframe file
Merge branch 'working' into compass_hotfix