Merge branch 'master' into jgrpp

# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp

src/linkgraph/linkgraph.h

@@ -497,7 +497,7 @@ public:
 	 * Get the current size of the component.
 	 * @return Size.
 	 */
-	inline uint Size() const { return this->nodes.size(); }
+	inline uint Size() const { return (uint)this->nodes.size(); }
 
 	/**
 	 * Get date of last compression.