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/industry_gui.cpp

@@ -1703,7 +1703,7 @@ public:
 				if (this->industries.SortType() == 2) this->industries.ForceResort();
 				break;
 
-			case IDIWD_FORCE_RESORT:
+			default:
 				this->industries.ForceResort();
 				break;
 		}