diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..e49605eb
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.idea
+.gradle
+.settings
+
+local.properties
+
+**build/**
+
+**/*.zip
\ No newline at end of file
diff --git a/ActionBar-PullToRefresh/build.gradle b/ActionBar-PullToRefresh/build.gradle
index 6d9a8fe9..09ad3a3b 100644
--- a/ActionBar-PullToRefresh/build.gradle
+++ b/ActionBar-PullToRefresh/build.gradle
@@ -18,7 +18,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..991b6763
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,31 @@
+# docker build -t android-build .
+
+FROM openjdk:8
+
+ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
+    ANDROID_HOME="/usr/local/android-sdk" \
+    ANDROID_VERSION=26 \
+    ANDROID_BUILD_TOOLS_VERSION=26.0.2
+
+WORKDIR /usr/src/app
+
+RUN mkdir "$ANDROID_HOME" .android \
+    && cd "$ANDROID_HOME" \
+    && curl -o sdk.zip $SDK_URL \
+    && unzip sdk.zip \
+    && rm sdk.zip \
+    && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+
+RUN sdkmanager --update
+RUN sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+    "platforms;android-${ANDROID_VERSION}" \
+    "platform-tools"
+
+COPY gradlew build.gradle ./
+COPY gradle/ ./gradle/
+
+RUN ./gradlew
+
+COPY . .
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5b96f6d8..109338b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,6 +14,12 @@ android {
         versionName "release35"
     }
 
+    lintOptions {
+        checkReleaseBuilds true
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 
     buildTypes {
 
@@ -23,8 +29,8 @@ android {
         }
 
         release {
-            minifyEnabled true // Enables code shrinking for the release build type.
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // minifyEnabled true // Enables code shrinking for the release build type.
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     flavorDimensions "free"
@@ -72,8 +78,9 @@ dependencies {
     compile 'oauth.signpost:signpost-core:1.2.1.2'
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.dropbox.core:dropbox-core-sdk:3.0.6'
+    // compile 'com.dropbox.core:dropbox-core-sdk:3.0.6'
+    // compile 'net.sf.proguard:proguard-gradle:6.0.3'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.15.0'
-}
+}
\ No newline at end of file
diff --git a/app/libs/dropbox-android-sdk-1.5.4.jar b/app/libs/dropbox-android-sdk-1.5.4.jar
new file mode 100644
index 00000000..38a3602f
Binary files /dev/null and b/app/libs/dropbox-android-sdk-1.5.4.jar differ
diff --git a/build.gradle b/build.gradle
index 8d8c28a9..de51fe0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
      */
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..7a3265ee
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f18dfc96..933b6473 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Mar 04 12:38:36 AEDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip