diff --git a/mifosng-android/build.gradle b/mifosng-android/build.gradle
index 36d0a96ce3d..fe34b314dee 100755
--- a/mifosng-android/build.gradle
+++ b/mifosng-android/build.gradle
@@ -111,6 +111,7 @@ android {
         abortOnError false
         disable 'InvalidPackage'
         disable 'MissingTranslation'
+        disable 'OutdatedLibrary'
     }
 
 
@@ -218,7 +219,7 @@ dependencies {
 
 
     implementation "com.joanzapata.iconify:android-iconify-material:2.1.1" // (v2.0.0)
-    implementation('com.crashlytics.sdk.android:crashlytics:17.2.2@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true
     }
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.java
deleted file mode 100644
index 5514d59f9c6..00000000000
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mifos.mifosxdroid;
-
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.SwitchPreference;;
-
-import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogFragment;
-import com.mifos.utils.FragmentConstants;
-
-/**
- * Created by mayankjindal on 22/07/17.
- */
-
-public class SettingsFragment extends PreferenceFragment {
-
-    SwitchPreference mEnableSyncSurvey;
-
-    public static SettingsFragment newInstance() {
-        SettingsFragment fragment = new SettingsFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
-        mEnableSyncSurvey = (SwitchPreference)
-                findPreference(getResources().getString(R.string.sync_survey));
-        mEnableSyncSurvey.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    if (((Boolean) newValue)) {
-                        SyncSurveysDialogFragment syncSurveysDialogFragment =
-                                SyncSurveysDialogFragment.newInstance();
-                        FragmentTransaction fragmentTransaction =
-                                getFragmentManager().beginTransaction();
-                            fragmentTransaction.addToBackStack(FragmentConstants.FRAG_SURVEYS_SYNC);
-                        syncSurveysDialogFragment.setCancelable(false);
-                        syncSurveysDialogFragment.show(fragmentTransaction,
-                                getResources().getString(R.string.sync_clients));
-                    }
-                    return true;
-                }
-            });
-    }
-}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
new file mode 100644
index 00000000000..023406c06e2
--- /dev/null
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
@@ -0,0 +1,41 @@
+package com.mifos.mifosxdroid
+
+import android.os.Bundle
+import android.preference.Preference.OnPreferenceChangeListener
+import android.preference.PreferenceFragment
+import android.preference.SwitchPreference
+import com.mifos.mifosxdroid.dialogfragments.syncsurveysdialog.SyncSurveysDialogFragment
+import com.mifos.utils.FragmentConstants
+
+/**
+ * Created by mayankjindal on 22/07/17.
+ */
+class SettingsFragment : PreferenceFragment() {
+    var mEnableSyncSurvey: SwitchPreference? = null
+    override fun onCreate(savedInstanceState: Bundle) {
+        super.onCreate(savedInstanceState)
+        addPreferencesFromResource(R.xml.preferences)
+        mEnableSyncSurvey = findPreference(resources.getString(R.string.sync_survey)) as SwitchPreference
+        mEnableSyncSurvey!!.onPreferenceChangeListener =
+                OnPreferenceChangeListener { preference, newValue ->
+            if (newValue as Boolean) {
+                val syncSurveysDialogFragment = SyncSurveysDialogFragment.newInstance()
+                val fragmentTransaction = fragmentManager.beginTransaction()
+                fragmentTransaction.addToBackStack(FragmentConstants.FRAG_SURVEYS_SYNC)
+                syncSurveysDialogFragment.isCancelable = false
+                syncSurveysDialogFragment.show(fragmentTransaction,
+                        resources.getString(R.string.sync_clients))
+            }
+            true
+        }
+    }
+
+    companion object {
+        fun newInstance(): SettingsFragment {
+            val fragment = SettingsFragment()
+            val args = Bundle()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java
index 34d2d713dbb..48f6c5ee828 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.java
@@ -107,7 +107,10 @@ protected void createLocationRequest() {
     }
 
     protected void startLocationUpdates() {
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission
+                .ACCESS_FINE_LOCATION) != PackageManager
+                .PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest
+                .permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             // TODO: Consider calling
             //    ActivityCompat#requestPermissions
             // here to request the missing permissions, and then overriding
@@ -117,7 +120,11 @@ protected void startLocationUpdates() {
             // for ActivityCompat#requestPermissions for more details.
             return;
         }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission
+                .ACCESS_FINE_LOCATION) != PackageManager
+                .PERMISSION_GRANTED && ActivityCompat
+                .checkSelfPermission(this, Manifest.permission
+                        .ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
             // TODO: Consider calling
             //    ActivityCompat#requestPermissions
             // here to request the missing permissions, and then overriding
@@ -149,7 +156,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     @Override
     public void onConnected(Bundle bundle) {
         if (currentLocation == null) {
-            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.checkSelfPermission(this, Manifest
+                    .permission.ACCESS_FINE_LOCATION) != PackageManager
+                    .PERMISSION_GRANTED && ActivityCompat
+                    .checkSelfPermission(this, Manifest.permission
+                            .ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 // TODO: Consider calling
                 //    ActivityCompat#requestPermissions
                 // here to request the missing permissions, and then overriding
@@ -159,7 +170,11 @@ public void onConnected(Bundle bundle) {
                 // for ActivityCompat#requestPermissions for more details.
                 return;
             }
-            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.checkSelfPermission(this, Manifest
+                    .permission.ACCESS_FINE_LOCATION) != PackageManager
+                    .PERMISSION_GRANTED && ActivityCompat
+                    .checkSelfPermission(this, Manifest.permission
+                            .ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 // TODO: Consider calling
                 //    ActivityCompat#requestPermissions
                 // here to request the missing permissions, and then overriding