Merge branch 'master' into jgrpp

# Conflicts:
#	src/economy.cpp

src/station_type.h

@@ -15,7 +15,6 @@
 #include "core/smallvec_type.hpp"
 #include "core/smallstack_type.hpp"
 #include "tilearea_type.h"
-#include <list>
 
 typedef uint16 StationID;
 typedef uint16 RoadStopID;
@@ -93,9 +92,6 @@ enum CatchmentArea {
 
 static const uint MAX_LENGTH_STATION_NAME_CHARS = 128; ///< The maximum length of a station name in characters including '\0'
 
-/** List of station IDs */
-typedef std::list<StationID> StationIDList;
-
 /** List of stations */
 typedef SmallVector<Station *, 2> StationList;