Merge pull request #2426 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Merge pull request #2432 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Fix issue #2433

This should fix events not spawning.
The .dme was still messed up.
Merge pull request #2435 from CIB/feature

Fix issue #2433
Merge pull request #2436 from Baystation12/BEF-staging

Bef staging