Merge remote-tracking branch 'origin/develop' into terrain-rewrite

# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp

lib/rmg/ConnectionsPlacer.cpp

@@ -25,6 +25,8 @@
 #include "WaterProxy.h"
 #include "TownPlacer.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 void ConnectionsPlacer::process()
 {
 	collectNeighbourZones();
@@ -279,3 +281,5 @@ void ConnectionsPlacer::collectNeighbourZones()
 		dNeighbourZones[zid].insert(i);
 	}
 }
+
+VCMI_LIB_NAMESPACE_END