Merge remote-tracking branch 'origin/MapEditor' into stableAlpha
Merge branch 'stableAlpha' of https://github.com/Turncoat/CollegeCrawl into stableAlpha