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/mapObjects/CGHeroInstance.h

@@ -17,6 +17,8 @@
 #include "../CArtHandler.h" // For CArtifactSet
 #include "../CRandomGenerator.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class CHero;
 class CGBoat;
 class CGTownInstance;
@@ -315,3 +317,5 @@ public:
 		BONUS_TREE_DESERIALIZATION_FIX
 	}
 };
+
+VCMI_LIB_NAMESPACE_END