Revert "Changed 'B737 NG' and 'B737 Classic' to hyphen separated (B737-NG)"

This reverts commit c3b33a81990e19e432fd914f875d51f8252f0618.
Revert "Changed 'B737 NG' and 'B737 Classic' to hyphen separated (B737-NG) #2"

This reverts commit a823a91b2f26134ddd961e11a200d3803f5d10ce.
Speedbrake dependencies fix.
Merge branch 'master' of https://github.com/FlightDataServices/FlightDataAnalyzer