Fixes for ZAS issues.
Fixes #2996
Fixes #3023
Merge pull request #3027 from SkyMarshal/airfixes

Fixes for ZAS issues.
Master Map Fixes
- Opps, fixed bar doors.
- And the floating glass at the swimming hole.
Merge pull request #3029 from fauxki/master

Master Map Fixes
Merge pull request #3031 from Baystation12/master

Updating BEF with master