Merge branch 'master' of https://github.com/Baystation12/Baystation12
Okay, mapmerger don't fail me...
Changes to camera tags for renamed areas.