fix bad merge
Merge remote-tracking branch 'upstream/development' into development
AeroQuad OSD meter to assist monitoring landing

  #if defined(AltitudeHoldBaro)
    climbFallRate = deltaAltitudeRateMeters(50.0); 			// update altitude rate in meters per second 50
  #endif
Merge branch 'development' of https://github.com/norem/AeroQuad into development
Revert "AeroQuad OSD meter to assist monitoring landing"

This reverts commit d595c04ebd8dff4e2b90ee739e8d4e9fdad27af4.
Update AltitudeControlProcessor.h

Cleaned up naming and removed feetpersecond reference
Merge pull request #396 from norem/development

Development