Merge pull request #2 from d3athrow/Bleeding-Edge

Bleeding edge
Merge pull request #3 from d3athrow/Bleeding-Edge

Bleeding edge
Metaclub Changes and Fixes

-changes to the bridge and conference room
-general fixes such as pipes under windows and the like
Merge pull request #2144 from IratePirate/Bleeding-Edge

Metaclub fixes and changes