Merge branch 'develop' into gil/SP1_space_creation

# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift

Riot/Modules/Common/Recents/RecentsViewController.h

@@ -18,7 +18,7 @@
 #import "MatrixKit.h"
 
 @class RootTabEmptyView;
-@class AnalyticsScreenTimer;
+@class AnalyticsScreenTracker;
 @class UserIndicatorPresenterWrapper;
 
 /**
@@ -95,7 +95,7 @@ FOUNDATION_EXPORT NSString *const RecentsViewControllerDataReadyNotification;
 /**
  The screen timer used for analytics if they've been enabled. The default value is nil.
  */
-@property (nonatomic) AnalyticsScreenTimer *screenTimer;
+@property (nonatomic) AnalyticsScreenTracker *screenTracker;
 
 /**
  Presenter for displaying app-wide user indicators. If not set, the view controller will use legacy activity indicators