diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 144331d502..2692a3e0dc 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4d5ff1c47a..d36f3500a5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 5e8cfeb16d..6a75afd773 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
     implementation "joda-time:joda-time:$rootProject.jodaTimeVersion"
 
-    implementation "com.google.firebase:firebase-messaging:$rootProject.firebaseVersion"
+    implementation "com.google.firebase:firebase-messaging:17.1.0"
     implementation "com.firebase:firebase-jobdispatcher:$rootProject.jobDispatcherVersion"
 
     implementation "com.github.hotchemi:permissionsdispatcher:$rootProject.permissionDispatcherVersion"
@@ -84,8 +84,8 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
     androidTestImplementation('com.android.support.test:runner:1.0.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 3ab7332133..2781e87e56 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java b/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java
index bf66fe2561..e671086485 100644
--- a/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java
+++ b/app/src/main/java/io/intelehealth/client/activities/home_activity/BackupCloud.java
@@ -178,7 +178,7 @@ public void startCloudRestore() {
                 boolean isSuccess = backup.createFileInMemory(context, false);
                 if (isSuccess) {
                     Intent serviceIntent = new Intent(context, ImageDownloadService.class);
-                    context.startService(serviceIntent);
+                   //context.startService(serviceIntent); removed on 2018.07.18 due to issues finding the right images
                 }
             } catch (IOException e1) {
                 e1.printStackTrace();
@@ -356,7 +356,7 @@ public void done(byte[] data, ParseException e) {
                                     boolean isSuccess = backup.createFileInMemory(context, false);
                                     if (isSuccess) {
                                         Intent serviceIntent = new Intent(context, ImageDownloadService.class);
-                                        context.getApplicationContext().startService(serviceIntent);
+                                        //context.getApplicationContext().startService(serviceIntent); //removed on 2018.07.18
                                     }
 
                                 } catch (FileNotFoundException exfnf) {
diff --git a/build.gradle b/build.gradle
index 80422707d6..a4f8ec6b3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ ext {
     supportLibraryVersion = '27.1.1'
     jodaTimeVersion = '2.9.3'
     arcaVersion = '4.9.2'
-    firebaseVersion = '15.0.2'
+    firebaseVersion = '16.0.1'
     cameraviewVersion = '9bbe07ba44'
     permissionDispatcherVersion = '2.3.2'
     debugDbVersion = '1.0.0'
@@ -58,6 +58,6 @@ ext {
     glideVersion = '3.8.0'
     parseAndroidVersion = '1.15.7'
     guavaVersion = '22.0-android'
-    constraintLayoutVersion = '1.1.0'
-    crashlyticsVersion = '2.9.2'
+    constraintLayoutVersion = '1.1.2'
+    crashlyticsVersion = '2.9.4'
 }
\ No newline at end of file