Fixes a bug with heat transfer.
Merge pull request #3384 from SkyMarshal/airfixes

Fixes a bug with heat transfer.
Fix for #3337.
Conflict fix?
Merge pull request #3386 from Segrain/dev-freeze

Dev-freeze bugfix.
Turns two ERT files into one. Also fixes the ERT admin button being bork.
Disables the duplicate Response Team file. They've been unified.
Merge pull request #3388 from meyar/master

ERT fixes
Camera's got lost in the shuffle.
Merge pull request #3389 from meyar/master

Camera's got lost in the shuffle.
Fix for #3344.
Fix for #3381.
Quickfix for fix.
Merge pull request #3390 from Segrain/master

Map fixes.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
Taser and examine fixes.
Commented out debug string.
Merge pull request #3387 from Zuhayr/feature

Fixes from master and dev-freeze.
Fixes #3383