Merge branch 'develop' into feature/quote

CONTRIBUTING.md

@@ -19,4 +19,4 @@ git clone https://github.com/RocketChat/Rocket.Chat.Android
 
 ### Code style guide
 
-Before submitting a PR you should follow our [Coding Style](https://github.com/filipedelimabrito/Rocket.Chat.Android/blob/develop/CODING_STYLE.md).
+Before submitting a PR you should follow our [Coding Style](https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/CODING_STYLE.md).

app/build.gradle

@@ -126,9 +126,7 @@ ext {
 }
 
 dependencies {
-    compile project(':log-wrapper')
     compile project(':android-ddp')
-    compile project(':rocket-chat-core')
     compile project(':rocket-chat-android-widgets')
     compile project(':persistence-realm')
     compile extraDependencies.okHTTP

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

@@ -53,6 +53,7 @@ import chat.rocket.android.layouthelper.extra_action.AbstractExtraActionItem;
 import chat.rocket.android.layouthelper.extra_action.MessageExtraActionBehavior;
 import chat.rocket.android.layouthelper.extra_action.upload.AbstractUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.AudioUploadActionItem;
+import chat.rocket.android.layouthelper.extra_action.upload.FileUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.ImageUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.VideoUploadActionItem;
 import chat.rocket.android.log.RCLog;
@@ -257,10 +258,11 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     private void setupMessageActions() {
-        extraActionItems = new ArrayList<>(3); // fixed number as of now
+        extraActionItems = new ArrayList<>(4); // fixed number as of now
         extraActionItems.add(new ImageUploadActionItem());
         extraActionItems.add(new AudioUploadActionItem());
         extraActionItems.add(new VideoUploadActionItem());
+        extraActionItems.add(new FileUploadActionItem());
     }
 
     private void scrollToLatestMessage() {