Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h

AsyncDisplayKit/ASCollectionNode.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASCollectionView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,6 +20,50 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) ASCollectionView *view;
 
+/**
+ * Tuning parameters for a range type.
+ *
+ * @param rangeType The range type to get the tuning parameters for.
+ *
+ * @returns A tuning parameter value for the given range type.
+ *
+ * Defaults to the render range having one sceenful both leading and trailing and the preload range having two
+ * screenfuls in both directions.
+ */
+- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType;
+
+/**
+ * Set the tuning parameters for a range type.
+ *
+ * @param tuningParameters The tuning parameters to store for a range type.
+ * @param rangeType The range type to set the tuning parameters for.
+ */
+- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
+
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
+ * the main thread.
+ * @warning This method is substantially more expensive than UICollectionView's version.
+ */
+- (void)reloadDataWithCompletion:(void (^)())completion;
+
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @warning This method is substantially more expensive than UICollectionView's version.
+ */
+- (void)reloadData;
+
+/**
+ * Reload everything from scratch entirely on the main thread, destroying the working range and all cached nodes.
+ *
+ * @warning This method is substantially more expensive than UICollectionView's version and will block the main thread
+ * while all the cells load.
+ */
+- (void)reloadDataImmediately;
+
 @end
 
 NS_ASSUME_NONNULL_END