Merge branch 'more_cond_orders-sx' into jgrpp

Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h

src/saveload/extended_ver_sl.h

@@ -36,6 +36,7 @@ enum SlXvFeatureIndex {
 	XSLFI_INFRA_SHARING,                          ///< Infrastructure sharing patch
 	XSLFI_VARIABLE_DAY_LENGTH,                    ///< Variable day length patch
 	XSLFI_ORDER_OCCUPANCY,                        ///< Running average of order occupancy
+	XSLFI_MORE_COND_ORDERS,                       ///< More conditional orders patch
 
 	XSLFI_SIZE,                                   ///< Total count of features, including null feature
 };