Merge branch 'signal_tunnels_bridges' into jgrpp

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h

src/train.h

@@ -117,6 +117,7 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> {
 	uint16 wait_counter;
 
 	uint16 reverse_distance;
+	uint16 tunnel_bridge_signal_num;
 
 	/** We don't want GCC to zero our struct! It already is zeroed and has an index! */
 	Train() : GroundVehicleBase() {}