Merge branch 'development'

# Conflicts:
#	Podfile.lock
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-Q-municate/Pods-Q-municate-resources.sh
#	Pods/Target Support Files/Pods-Q-municate/Pods-Q-municate.debug.xcconfig
#	Pods/Target Support Files/Pods-Q-municate/Pods-Q-municate.release.xcconfig
#	Q-municate.xcodeproj/project.pbxproj

External/Quickblox.framework/Headers/QBAddressBookContact.h

@@ -0,0 +1,26 @@
+//
+//  QBAddressBookContact.h
+//  Quickblox
+//
+//  Created by Andrey Ivanov on 13/09/2017.
+//  Copyright © 2017 QuickBlox. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QBAddressBookContact : NSObject <NSCoding, NSCopying>
+
+/** Name (required only for create/update), min 1 max 255 symbols */
+@property (nonatomic, copy) NSString *name;
+
+/** Phone (required), min 10 max 15 symbols */
+@property (nonatomic, copy) NSString *phone;
+
+/** Destroy (not required, possible value YES) */
+@property (nonatomic) BOOL destroy;
+
+@end
+
+NS_ASSUME_NONNULL_END

External/Quickblox.framework/Headers/QBAddressBookHeader.h

@@ -0,0 +1,12 @@
+//
+//  QBAddressBookHeader.h
+//  Pods
+//
+//  Created by Andrey Ivanov on 13/09/2017.
+//
+//
+
+#import <Quickblox/QBAddressBookContact.h>
+#import <Quickblox/QBRequest+QBAddressBook.h>
+#import <Quickblox/QBAddressBookUpdates.h>
+#import <Quickblox/QBAddressBookRejectDetails.h>

External/Quickblox.framework/Headers/QBAddressBookRejectDetails.h

@@ -0,0 +1,21 @@
+//
+//  QBAddressBookRejectDetails.h
+//  Pods
+//
+//  Created by Andrey Ivanov on 14/09/2017.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QBAddressBookRejectDetails : NSObject
+/** The index of rejected object */
+@property (nonatomic, assign) NSUInteger index;
+/** Reject reason */
+@property (nonatomic, copy) NSString *details;
+
+@end
+
+NS_ASSUME_NONNULL_END

External/Quickblox.framework/Headers/QBAddressBookUpdates.h

@@ -0,0 +1,28 @@
+//
+//  QBAddressBookUpdates.h
+//  Quickblox
+//
+//  Created by Andrey Ivanov on 13/09/2017.
+//  Copyright © 2017 QuickBlox. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class QBAddressBookRejectDetails;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QBAddressBookUpdates : NSObject
+
+/** The number of created objects */
+@property (nonatomic, assign) NSUInteger created;
+/** The number of deleted objects */
+@property (nonatomic, assign) NSUInteger deleted;
+/** The number of updated objects */
+@property (nonatomic, assign) NSUInteger updated;
+/** The array of rejected objects */
+@property (nonatomic, strong, nullable) NSArray<QBAddressBookRejectDetails *> *rejected;
+
+@end
+
+NS_ASSUME_NONNULL_END

External/Quickblox.framework/Headers/QBChat.h

@@ -288,16 +288,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)pingUserWithID:(NSUInteger)userID timeout:(NSTimeInterval)timeout completion:(QBPingCompleitonBlock)completion;
 
-//MARK: Deprecated
-
-/**
- *  Set an active privacy list. QBChatDelegate's method 'didSetActivePrivacyListWithName:' will be called if success or 'didNotSetActivePrivacyListWithName:error:' if there is an error
- *
- *  @param privacyListName name of privacy list
- *  @warning Deprecated in 2.10.
- */
-- (void)setActivePrivacyListWithName:(nullable NSString *)privacyListName
-DEPRECATED_MSG_ATTRIBUTE("Deprecated in 2.10. Use setDefaultPrivacyListWithName:");
 
 @end
 

External/Quickblox.framework/Headers/QBContactList.h

@@ -28,29 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, readonly, nullable) NSArray<QBContactListItem *> *pendingApproval;
 
-/**
- *  Get last activity
- *
- *  @param item     QBContactListItem
- *  @param completion completion block with last activity in seconds and error
- *  @warning Deprecated in 2.10.
- */
-- (void)lastActivityForContactListItem:(QBContactListItem *)item
-                        withCompletion:(QBUserLastActivityCompletionBlock)completion;
-DEPRECATED_MSG_ATTRIBUTE("Deprecated in 2.10. Use - [QBChat lastActivityForUserID:completion:]");
-/**
- *  Get last activity
- *
- *  @param item       QBContactListItem
- *  @param timeout    timeout
- *  @param completion completion block with last activity in seconds and error
- *  @warning Deprecated in 2.10.
- */
-- (void)lastActivityForContactListItem:(QBContactListItem *)item
-                           withTimeout:(NSTimeInterval)timeout
-                            completion:(QBUserLastActivityCompletionBlock)completion
-DEPRECATED_MSG_ATTRIBUTE("Deprecated in 2.10. Use - [QBChat lastActivityForUserID:withTimeout:completion:]");
-
 @end
 
 NS_ASSUME_NONNULL_END

External/Quickblox.framework/Headers/QBGeneralResponsePage.h

@@ -1,5 +1,5 @@
 //
-//  QBLGeoDataResponsePage.h
+//  QBGeneralResponsePage.h
 //  Quickblox
 //
 //  Created by QuickBlox team on 4/28/14.