IA camera returned, pipe overlap fixes for Misc. research.
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze