Merge branch 'master' into jgrpp

# Conflicts:
#	src/signs_cmd.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
#	src/waypoint_cmd.cpp

src/viewport_kdtree.h

@@ -65,9 +65,7 @@ struct ViewportSignKdtreeItem {
 	}
 
 	static ViewportSignKdtreeItem MakeStation(StationID id);
-	static ViewportSignKdtreeItem MakeStation(StationID id, Point pt);
 	static ViewportSignKdtreeItem MakeWaypoint(StationID id);
-	static ViewportSignKdtreeItem MakeWaypoint(StationID id, Point pt);
 	static ViewportSignKdtreeItem MakeTown(TownID id);
 	static ViewportSignKdtreeItem MakeSign(SignID id);
 };