diff --git a/src/custom/AndroidManifest.xml b/src/custom/AndroidManifest.xml
new file mode 100644
index 0000000000..d7d99adb1c
--- /dev/null
+++ b/src/custom/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2017  Mario Danic
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+
+    <application
+        android:name="com.owncloud.android.CustomApp"
+        tools:replace="android:name">
+
+    </application>
+
+</manifest>
diff --git a/src/custom/java/com/owncloud/android/CustomApp.java b/src/custom/java/com/owncloud/android/CustomApp.java
new file mode 100644
index 0000000000..a0d79c4ffe
--- /dev/null
+++ b/src/custom/java/com/owncloud/android/CustomApp.java
@@ -0,0 +1,52 @@
+/**
+ * Nextcloud Android client application
+ *
+ * @author Mario Danic
+ * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android;
+
+import com.google.firebase.analytics.FirebaseAnalytics;
+
+/**
+ * Custom App class for custom builds
+ */
+
+public class CustomApp extends MainApp {
+
+    private FirebaseAnalytics firebaseAnalytics;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this);
+    }
+
+    private FirebaseAnalytics getFirebaseAnalyticsInstance() {
+        /*
+        In order for Firebase Analytics to work, you also need to
+        put a proper google-services.json in src/custom folder
+         */
+        if (getResources().getBoolean(R.bool.enable_analytics)) {
+            return firebaseAnalytics;
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java b/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
deleted file mode 100644
index 91c86fb18f..0000000000
--- a/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   Copyright (C) 2012 Bartek Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.fragment;
-
-import android.support.v4.app.Fragment;
-
-public class AuthenticatorAccountDetailsFragment extends Fragment {
-
-}
diff --git a/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java b/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
deleted file mode 100644
index dc673bf68f..0000000000
--- a/src/main/java/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   Copyright (C) 2012 Bartek Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.fragment;
-
-import android.support.v4.app.Fragment;
-
-public class AuthenticatorGetStartedFragment extends Fragment {
-
-}
diff --git a/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java b/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
index 0786cb42d5..bcc193f384 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
@@ -66,8 +66,7 @@ public class EditShareFragment extends Fragment {
 
     /** Listener for changes on privilege checkboxes */
     private CompoundButton.OnCheckedChangeListener mOnPrivilegeChangeListener;
-
-
+    
     /**
      * Public factory method to create new EditShareFragment instances.
      *
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index d8b92be977..afc4777763 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -99,6 +99,9 @@
     <!-- login data links -->
     <string name="login_data_own_scheme" translatable="false">cloud</string>
 
+    <!-- firebase analytics -->
+    <bool name="enable_analytics">false</bool>
+
 </resources>