Merge branch 'master' into jgrpp-nrt

Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp

source.list

@@ -30,7 +30,6 @@ dedicated.cpp
 departures.cpp
 depot.cpp
 disaster_vehicle.cpp
-dock.cpp
 driver.cpp
 economy.cpp
 effectvehicle.cpp
@@ -193,7 +192,6 @@ direction_func.h
 direction_type.h
 disaster_vehicle.h
 music/dmusic.h
-dock_base.h
 driver.h
 economy_base.h
 economy_func.h