Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/InlineHightlighter.java → rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/InlineHightlighter.java

-package chat.rocket.android.widget.message;
+package chat.rocket.android.widget.helper;
 
 import android.content.Context;
 import android.graphics.Color;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageLayout.java

@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import chat.rocket.android.widget.R;
+import chat.rocket.android.widget.helper.InlineHightlighter;
 import chat.rocket.android.widget.helper.Linkify;
 import com.emojione.Emojione;