diff --git a/kute-android-app/.idea/caches/build_file_checksums.ser b/kute-android-app/.idea/caches/build_file_checksums.ser
new file mode 100644
index 00000000..90c69909
Binary files /dev/null and b/kute-android-app/.idea/caches/build_file_checksums.ser differ
diff --git a/kute-android-app/.idea/caches/gradle_models.ser b/kute-android-app/.idea/caches/gradle_models.ser
new file mode 100644
index 00000000..8ea9d4d4
Binary files /dev/null and b/kute-android-app/.idea/caches/gradle_models.ser differ
diff --git a/kute-android-app/.idea/codeStyles/Project.xml b/kute-android-app/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..30aa626c
--- /dev/null
+++ b/kute-android-app/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/kute-android-app/.idea/compiler.xml b/kute-android-app/.idea/compiler.xml
deleted file mode 100644
index 96cc43ef..00000000
--- a/kute-android-app/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/kute-android-app/.idea/copyright/profiles_settings.xml b/kute-android-app/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf33..00000000
--- a/kute-android-app/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/kute-android-app/.idea/gradle.xml b/kute-android-app/.idea/gradle.xml
index 7ac24c77..2996d531 100644
--- a/kute-android-app/.idea/gradle.xml
+++ b/kute-android-app/.idea/gradle.xml
@@ -3,14 +3,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
diff --git a/kute-android-app/.idea/misc.xml b/kute-android-app/.idea/misc.xml
index 7158618b..37a75096 100644
--- a/kute-android-app/.idea/misc.xml
+++ b/kute-android-app/.idea/misc.xml
@@ -1,62 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/kute-android-app/.idea/vcs.xml b/kute-android-app/.idea/vcs.xml
new file mode 100644
index 00000000..6c0b8635
--- /dev/null
+++ b/kute-android-app/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/kute-android-app/app/build.gradle b/kute-android-app/app/build.gradle
index 3c83b30d..e19cdf93 100644
--- a/kute-android-app/app/build.gradle
+++ b/kute-android-app/app/build.gradle
@@ -14,17 +14,16 @@ android {
         exclude 'META-INF/dependencies.txt'
         exclude 'META-INF/LGPL2.1'
     }
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 26
 
 
     android {
-        compileSdkVersion 25
-        buildToolsVersion "25.0.0"
+        compileSdkVersion 26
+        buildToolsVersion "28.0.3"
         defaultConfig {
             applicationId "com.scorelab.kute.kute"
             minSdkVersion 15
-            targetSdkVersion 25
+            targetSdkVersion 26
             versionCode 1
             versionName "1.0"
             testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -46,56 +45,56 @@ android {
     }
 
     dependencies {
-        compile fileTree(dir: 'libs', include: ['*.jar'])
-        androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        implementation fileTree(dir: 'libs', include: ['*.jar'])
+        androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
             exclude group: 'com.android.support', module: 'support-annotations'
         })
 
 
 
-        compile 'com.google.firebase:firebase-core:10.0.1'
-        compile 'com.google.firebase:firebase-auth:10.0.1'
-        compile 'com.google.firebase:firebase-database:10.0.1'
-        compile 'com.google.android.gms:play-services-auth:10.0.1'
-        compile 'com.google.android.gms:play-services-plus:10.0.1'
-        compile 'com.google.android.gms:play-services-maps:10.0.1'
-        compile 'com.google.android.gms:play-services-location:10.0.1'
-        compile 'com.facebook.android:facebook-android-sdk:4.11.0'
-        compile 'com.android.volley:volley:1.0.0'
-        compile 'com.android.support:appcompat-v7:25.0.0'
-        compile 'com.android.support:design:25.1.1'
-        compile 'de.hdodenhof:circleimageview:2.1.0'
-        testCompile 'junit:junit:4.12'
+        implementation 'com.google.firebase:firebase-core:16.0.7'
+        implementation 'com.google.firebase:firebase-auth:16.1.0'
+        implementation 'com.google.firebase:firebase-database:16.0.6'
+        implementation 'com.google.android.gms:play-services-auth:16.0.1'
+        implementation 'com.google.android.gms:play-services-plus:16.0.0'
+        implementation 'com.google.android.gms:play-services-maps:16.1.0'
+        implementation 'com.google.android.gms:play-services-location:16.0.0'
+        implementation 'com.facebook.android:facebook-android-sdk:4.25.0'
+        implementation 'com.android.volley:volley:1.1.0'
+        implementation 'com.android.support:appcompat-v7:26.0.1'
+        implementation 'com.android.support:design:26.1.0'
+        implementation 'de.hdodenhof:circleimageview:2.1.0'
+        implementation 'junit:junit:4.12'
     }
 
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
 
 
-    compile 'com.google.firebase:firebase-core:11.0.1'
-    compile 'com.google.firebase:firebase-auth:11.0.1'
-    compile 'com.google.firebase:firebase-database:11.0.1'
-    compile 'com.google.android.gms:play-services-auth:11.0.1'
-    compile 'com.google.android.gms:play-services-plus:11.0.1'
-    compile 'com.google.android.gms:play-services-maps:11.0.1'
-    compile 'com.google.android.gms:play-services-location:11.0.1'
-    compile 'com.google.android.gms:play-services-places:11.0.1'
-    compile 'com.facebook.android:facebook-android-sdk:4.25.0'
-    compile 'com.android.volley:volley:1.0.0'
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:design:25.1.1'
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'org.osmdroid:osmdroid-android:5.6.4'
-    compile 'com.google.firebase:firebase-messaging:11.0.1'
-    compile 'com.google.firebase:firebase-core:11.0.1'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.google.firebase:firebase-auth:16.1.0'
+    implementation 'com.google.firebase:firebase-database:16.0.6'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
+    implementation 'com.google.android.gms:play-services-plus:16.0.0'
+    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-places:16.0.0'
+    implementation 'com.facebook.android:facebook-android-sdk:4.25.0'
+    implementation 'com.android.volley:volley:1.1.0'
+    implementation 'com.android.support:appcompat-v7:26.0.1'
+    implementation 'com.android.support:design:26.0.1'
+    implementation 'de.hdodenhof:circleimageview:2.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'org.osmdroid:osmdroid-android:5.6.4'
+    implementation 'com.google.firebase:firebase-messaging:17.4.0'
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    testImplementation 'junit:junit:4.12'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/kute-android-app/app/src/main/res/values/strings.xml b/kute-android-app/app/src/main/res/values/strings.xml
index 16ba4905..45507147 100644
--- a/kute-android-app/app/src/main/res/values/strings.xml
+++ b/kute-android-app/app/src/main/res/values/strings.xml
@@ -27,8 +27,7 @@
     <string name="action_settings">Settings</string>
 
 
-    <string name="facebook_app_id">Enter your own facebook app id</string>
-    <string name="googlemapApi">enter your own maps api key </string>
+
     <string name="title_activity_test">test</string>
 
     <!--The strings below are for the intro details dialog -->
diff --git a/kute-android-app/build.gradle b/kute-android-app/build.gradle
index 33f2f1e7..7f14040e 100644
--- a/kute-android-app/build.gradle
+++ b/kute-android-app/build.gradle
@@ -4,10 +4,11 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.google.gms:google-services:4.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
 }
 
diff --git a/kute-android-app/gradle/wrapper/gradle-wrapper.properties b/kute-android-app/gradle/wrapper/gradle-wrapper.properties
index 7a906204..14f09720 100644
--- a/kute-android-app/gradle/wrapper/gradle-wrapper.properties
+++ b/kute-android-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 02 17:28:35 IST 2017
+#Sat Feb 23 16:21:00 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip