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/mapping/CMapEditManager.cpp

@@ -18,6 +18,8 @@
 #include "../mapping/CMap.h"
 #include "CMapOperation.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 CMapUndoManager::CMapUndoManager() :
 	undoRedoLimit(100000), //not sure if we ever need to bother about undo limit
 	undoCallback([](bool, bool) {})
@@ -199,3 +201,5 @@ CMapUndoManager & CMapEditManager::getUndoManager()
 {
 	return undoManager;
 }
+
+VCMI_LIB_NAMESPACE_END