Merge branch 'master' into jgrpp

# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp

src/town_gui.cpp

@@ -710,7 +710,6 @@ private:
 					continue;
 				}
 				this->string_filter.ResetState();
-
 				this->string_filter.AddLine(t->GetCachedName());
 				if (this->string_filter.GetState()) this->towns.push_back(t);
 			}