IA camera returned, pipe overlap fixes for Misc. research.
Merge pull request #1 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze
Merge pull request #2506 from Gamerofthegame/bleeding-edge-freeze

Minor map fixes