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/Zone.cpp

@@ -18,6 +18,8 @@
 #include "CMapGenerator.h"
 #include "RmgPath.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 std::function<bool(const int3 &)> AREA_NO_FILTER = [](const int3 & t)
 {
 	return true;
@@ -405,3 +407,5 @@ Modificator::~Modificator()
 {
 	
 }
+
+VCMI_LIB_NAMESPACE_END