Terrain bonuses done, fixed overworldStage code
Merge remote-tracking branch 'origin/master'