Merge branch 'develop' into gil/SP1_space_creation

# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift

Riot/Modules/Common/Recents/RecentsViewController.h

@@ -19,6 +19,7 @@
 
 @class RootTabEmptyView;
 @class AnalyticsScreenTimer;
+@class AppActivityIndicatorPresenter;
 
 /**
  Notification to be posted when recents data is ready. Notification object will be the RecentsViewController instance.
@@ -96,6 +97,11 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
  */
 @property (nonatomic) AnalyticsScreenTimer *screenTimer;
 
+/**
+ Presenter for displaying app-wide activity / loading indicators. If not set, the view controller will use legacy activity indicators
+ */
+@property (nonatomic, strong) AppActivityIndicatorPresenter *activityPresenter;
+
 /**
  Return the sticky header for the specified section of the table view