Merge branch 'save_ext' into jgrpp

# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp

src/tile_map.h

@@ -132,9 +132,9 @@ static inline void SetTileType(TileIndex tile, TileType type)
 }
 
 /**
- * Checks if a tile is a give tiletype.
+ * Checks if a tile is a given tiletype.
  *
- * This function checks if a tile got the given tiletype.
+ * This function checks if a tile has the given tiletype.
  *
  * @param tile The tile to check
  * @param type The type to check against