Merge commit 'a8c505c2f9175ae0bece1f62708e6fc31e587897' into feature/3746_merge_element_1.9.10

# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml

Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.h

@@ -92,6 +92,22 @@ typedef enum : NSUInteger
  */
 - (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView sendTextMessage:(NSString*)textMessage;
 
+/**
+ Tells the delegate that the user wants to send a formatted  text message.
+
+ @param toolbarView the room input toolbar view.
+ @param formattedTextMessage the formatted message to send.
+ @param rawText the raw message to send.
+ */
+- (void)roomInputToolbarView:(MXKRoomInputToolbarView *)toolbarView sendFormattedTextMessage:(NSString *)formattedTextMessage withRawText:(NSString *)rawText;
+
+/**
+ Tells the delegate that the user wants to display the send media actions.
+
+ @param toolbarView the room input toolbar view.
+ */
+- (void)roomInputToolbarViewShowSendMediaActions:(MXKRoomInputToolbarView *)toolbarView;
+
 /**
  Tells the delegate that the user wants to send an image.
  
@@ -222,7 +238,7 @@ typedef enum : NSUInteger
  @discussion This is the designated initializer for programmatic instantiation.
  @return An initialized `MXKRoomInputToolbarView-inherited` object if successful, `nil` otherwise.
  */
-+ (instancetype)roomInputToolbarView;
++ (MXKRoomInputToolbarView *)instantiateRoomInputToolbarView;
 
 /**
  The delegate notified when inputs are ready.
@@ -333,7 +349,7 @@ typedef enum : NSUInteger
  actually used to retrieve the keyboard view. Indeed the keyboard view is the superview of
  the accessory view when the message composer become the first responder.
  */
-@property (readonly) UIView *inputAccessoryViewForKeyboard;
+@property UIView *inputAccessoryViewForKeyboard;
 
 /**
  Display the keyboard.

Riot/Modules/MatrixKit/Views/RoomInputToolbar/MXKRoomInputToolbarView.m

@@ -69,7 +69,7 @@
                           bundle:[NSBundle bundleForClass:[MXKRoomInputToolbarView class]]];
 }
 
-+ (instancetype)roomInputToolbarView
++ (MXKRoomInputToolbarView *)instantiateRoomInputToolbarView
 {
     if ([[self class] nib])
     {