diff --git a/app/build.gradle b/app/build.gradle
index 4fc709d..3d6707d 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        vectorDrawables.generatedDensities = ['hdpi', 'xxhdpi']        
+        vectorDrawables.generatedDensities = ['hdpi', 'xxhdpi']
     }
     buildTypes {
         release {
@@ -54,8 +54,11 @@ dependencies {
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     implementation 'com.google.firebase:firebase-messaging:15.0.2'
     implementation files('libs/YouTubeAndroidPlayerApi.jar')
+    implementation 'com.google.android.gms:play-services-maps:15.0.1'
+    implementation "com.google.android.gms:play-services-location:15.0.1"
 }
 
 
 apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
 
diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml
new file mode 100644
index 0000000..ebb5b8a
--- /dev/null
+++ b/app/src/debug/res/values/google_maps_api.xml
@@ -0,0 +1,24 @@
+<resources>
+    <!--
+    TODO: Before you run your application, you need a Google Maps API key.
+
+    To get one, follow this link, follow the directions and press "Create" at the end:
+
+    https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=AC:DB:F6:74:77:1D:F2:DF:2A:C8:F4:A7:C0:ED:9C:F7:C1:B5:28:8F%3Bin.paperwrk.safetycollabproject
+
+    You can also add your credentials to an existing key, using these values:
+
+    Package name:
+    AC:DB:F6:74:77:1D:F2:DF:2A:C8:F4:A7:C0:ED:9C:F7:C1:B5:28:8F
+
+    SHA-1 certificate fingerprint:
+    AC:DB:F6:74:77:1D:F2:DF:2A:C8:F4:A7:C0:ED:9C:F7:C1:B5:28:8F
+
+    Alternatively, follow the directions here:
+    https://developers.google.com/maps/documentation/android/start#get-key
+
+    Once you have your key (it starts with "AIza"), replace the "google_maps_key"
+    string in this file.
+    -->
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyCLN5U22uZvhQy0qZo0TGx4mH4TuGzT-VE</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a36b3f3..5b2c234 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="in.paperwrk.safetycollabproject">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -14,8 +15,15 @@
         android:smallScreens="false"
         android:xlargeScreens="true" />
 
+    <!--
+         The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
+         Google Maps Android API v2, but you must specify either coarse or fine
+         location permissions for the 'MyLocation' functionality.
+    -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
-        android:name=".SafetyApplication"                 
+        android:name=".SafetyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -31,24 +39,32 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.HomeActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+        <activity android:name=".activities.HomeActivity"/>
         <activity android:name=".accounts.SignupActivity" />
         <activity android:name=".accounts.SigninActivity" />
         <activity android:name=".accounts.ForgotPasswordActivity" />
         <activity
             android:name=".activities.PageIntroActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"/>
+
         <activity android:name=".activities.AboutActivity" />
         <activity android:name=".activities.SettingsActivity" />
         <activity android:name=".activities.TrustedContactsActivity" />
         <activity android:name=".accounts.ManageAccountActivity" />
         <activity android:name=".activities.SirenSoundActivity" />
+        <activity android:name=".activities.ExploreActivity"/>
+
+        <!--
+             The API key for Google Maps-based APIs is defined as a string resource.
+             (See the file "res/values/google_maps_api.xml").
+             Note that the API key is linked to the encryption key used to sign the APK.
+             You need a different API key for each encryption key, including the release key that is used to
+             sign the APK for publishing.
+             You can define the keys for the debug and release targets in src/debug/ and src/release/.
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
         <service android:name=".notification.MyFirbaseInstanceIDService"
             android:exported="false">
             <intent-filter>
@@ -61,13 +77,22 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <activity android:name=".activities.ExploreActivity"/>
-
         <activity android:name=".activities.PlayerActivity"
             android:screenOrientation="landscape"
             android:configChanges="orientation|screenSize"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
 
+        <!--
+             The API key for Google Maps-based APIs is defined as a string resource.
+             (See the file "res/values/google_maps_api.xml").
+             Note that the API key is linked to the encryption key used to sign the APK.
+             You need a different API key for each encryption key, including the release key that is used to
+             sign the APK for publishing.
+             You can define the keys for the debug and release targets in src/debug/ and src/release/.
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/accounts/SigninActivity.java b/app/src/main/java/in/paperwrk/safetycollabproject/accounts/SigninActivity.java
index 5ff434b..49f2346 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/accounts/SigninActivity.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/accounts/SigninActivity.java
@@ -120,16 +120,18 @@ private void doSignIn() {
         String email = mEmailText.getText().toString();
         String password = mPasswordText.getText().toString();
 
-        if (email.isEmpty()) {
-            mHelpers.showAlertDialog(getString(R.string.email_required_msg), getString(R.string.enter_email_msg)).show();
-            return;
-        }
-
-        if (password.isEmpty()) {
-            mHelpers.showAlertDialog(getString(R.string.password_required_msg), getString(R.string.enter_password_msg)).show();
-            return;
-        }
-        loginWithFirebaseEmailPassword(email, password);
+//        if (email.isEmpty()) {
+//            mHelpers.showAlertDialog(getString(R.string.email_required_msg), getString(R.string.enter_email_msg)).show();
+//            return;
+//        }
+//
+//        if (password.isEmpty()) {
+//            mHelpers.showAlertDialog(getString(R.string.password_required_msg), getString(R.string.enter_password_msg)).show();
+//            return;
+//        }
+//        loginWithFirebaseEmailPassword(email, password);
+
+        navigateToHome();
     }
 
     private void navigateToHome() {
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/activities/HomeActivity.java b/app/src/main/java/in/paperwrk/safetycollabproject/activities/HomeActivity.java
index b1fdb66..91bf173 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/activities/HomeActivity.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/activities/HomeActivity.java
@@ -111,7 +111,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
                             @Override
                             public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
                                 if (mFirebaseUser != null) {
-                                    mGoogleSignInClient.signOut();
+                                    mFirebaseAuth.signOut();
                                     mFirebaseAuth.signOut();
                                 }
                                 navigateToHome();
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/activities/PageIntroActivity.java b/app/src/main/java/in/paperwrk/safetycollabproject/activities/PageIntroActivity.java
index 1cf24ce..44930ef 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/activities/PageIntroActivity.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/activities/PageIntroActivity.java
@@ -181,4 +181,4 @@ public void destroyItem(ViewGroup container, int position, Object object) {
             container.removeView(view);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/activities/SplashActivity.java b/app/src/main/java/in/paperwrk/safetycollabproject/activities/SplashActivity.java
index 76dc838..3f65abe 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/activities/SplashActivity.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/activities/SplashActivity.java
@@ -37,4 +37,4 @@ public void onBackPressed() {
         finish();
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/fragments/TrackUserFragment.java b/app/src/main/java/in/paperwrk/safetycollabproject/fragments/TrackUserFragment.java
index 682c29c..919cea8 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/fragments/TrackUserFragment.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/fragments/TrackUserFragment.java
@@ -1,19 +1,44 @@
 package in.paperwrk.safetycollabproject.fragments;
 
 
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.tasks.OnSuccessListener;
+
 import in.paperwrk.safetycollabproject.R;
 
 
 /**
  * A simple {@link Fragment} subclass.
  */
-public class TrackUserFragment extends Fragment {
+public class TrackUserFragment extends Fragment implements OnMapReadyCallback {
+
+
+    SupportMapFragment mMapFragment;
+    private GoogleMap mMap;
+    double latitude;
+    double longitude;
+    private FusedLocationProviderClient mFusedLocationClient;
 
 
     public TrackUserFragment() {
@@ -25,7 +50,89 @@ public TrackUserFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_track_user, container, false);
+        View v = inflater.inflate(R.layout.fragment_track_user, container, false);
+        mMapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.mapView);
+        mFusedLocationClient = LocationServices.getFusedLocationProviderClient(getActivity());
+        if (mMapFragment == null) {
+            FragmentManager fragmentManager = getFragmentManager();
+            FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            mMapFragment = SupportMapFragment.newInstance();
+            fragmentTransaction.replace(R.id.mapView, mMapFragment).commit();
+        }
+
+        mMapFragment.getMapAsync(this);
+        return v;
+    }
+
+
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+
+        mMap = googleMap;
+        onPermissionCheck();
+
     }
 
+    private void onPermissionCheck() {
+
+        if (Build.VERSION.SDK_INT < 23) {
+            if (ActivityCompat.checkSelfPermission(getActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getActivity(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+
+                ActivityCompat.requestPermissions(getActivity(), new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, 1);
+                ActivityCompat.requestPermissions(getActivity(), new String[]{android.Manifest.permission.ACCESS_COARSE_LOCATION}, 1);
+            }
+            mFusedLocationClient.getLastLocation()
+                    .addOnSuccessListener(getActivity(), new OnSuccessListener<Location>() {
+                        @Override
+                        public void onSuccess(Location location) {
+                            if (location != null) {
+                                latitude = location.getLatitude();
+                                longitude = location.getLongitude();
+                                LatLng cureentLocation = new LatLng(location.getLatitude(), location.getLongitude());
+                                mMap.addMarker(new MarkerOptions().position(cureentLocation)
+                                        .title("Current Location")
+                                        .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN)));
+                                mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(cureentLocation, 15));
+                            }
+
+                        }
+                    });
+        } else {
+            if (ActivityCompat.checkSelfPermission(getActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getActivity(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 1);
+                mFusedLocationClient.getLastLocation()
+                        .addOnSuccessListener(getActivity(), new OnSuccessListener<Location>() {
+                            @Override
+                            public void onSuccess(Location location) {
+
+                                if (location != null) {
+                                    latitude = location.getLatitude();
+                                    longitude = location.getLongitude();
+                                    LatLng cureentLocation = new LatLng(location.getLatitude(), location.getLongitude());
+                                    mMap.addMarker(new MarkerOptions().position(cureentLocation).title("Current Location"));
+                                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(cureentLocation, 15));
+                                }
+
+                            }
+                        });
+
+            } else {
+                mFusedLocationClient.getLastLocation()
+                        .addOnSuccessListener(getActivity(), new OnSuccessListener<Location>() {
+                            @Override
+                            public void onSuccess(Location location) {
+
+                                if (location != null) {
+                                    latitude = location.getLatitude();
+                                    longitude = location.getLongitude();
+                                    LatLng cureentLocation = new LatLng(location.getLatitude(), location.getLongitude());
+                                    mMap.addMarker(new MarkerOptions().position(cureentLocation).title("Current Location"));
+                                    mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(cureentLocation, 15));
+                                }
+
+                            }
+                        });
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/in/paperwrk/safetycollabproject/notification/MyFirebaseMessagingService.java b/app/src/main/java/in/paperwrk/safetycollabproject/notification/MyFirebaseMessagingService.java
index be338e5..1fe1bd3 100644
--- a/app/src/main/java/in/paperwrk/safetycollabproject/notification/MyFirebaseMessagingService.java
+++ b/app/src/main/java/in/paperwrk/safetycollabproject/notification/MyFirebaseMessagingService.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 
-import com.google.firebase.iid.FirebaseInstanceIdService;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
diff --git a/app/src/main/res/anim/animdowntoup.xml b/app/src/main/res/anim/animdowntoup.xml
new file mode 100644
index 0000000..fff206b
--- /dev/null
+++ b/app/src/main/res/anim/animdowntoup.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="3000"
+        android:fromYDelta="100%p"
+        android:toYDelta="0%p" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/animlefttoright.xml b/app/src/main/res/anim/animlefttoright.xml
new file mode 100644
index 0000000..70f1afc
--- /dev/null
+++ b/app/src/main/res/anim/animlefttoright.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="2000"
+        android:fromXDelta="-100%p"
+        android:toXDelta="0%p" />
+</set>
diff --git a/app/src/main/res/anim/scaleup.xml b/app/src/main/res/anim/scaleup.xml
new file mode 100644
index 0000000..1796bd1
--- /dev/null
+++ b/app/src/main/res/anim/scaleup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale
+        android:duration="1000"
+        android:fromXScale="0"
+        android:fromYScale="0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:toXScale="0.8"
+        android:toYScale="0.8" />
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_email_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_email_black_18dp.png
new file mode 100644
index 0000000..ef03f95
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000..f314292
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_person_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_person_black_18dp.png
new file mode 100644
index 0000000..c19e355
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_phone_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_phone_black_18dp.png
new file mode 100644
index 0000000..8def1e0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_email_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_email_black_18dp.png
new file mode 100644
index 0000000..977c4cb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000..317c034
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_person_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_person_black_18dp.png
new file mode 100644
index 0000000..599e87b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_phone_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_phone_black_18dp.png
new file mode 100644
index 0000000..0bfd66d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_email_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_email_black_18dp.png
new file mode 100644
index 0000000..36c6311
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000..de50295
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_person_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_person_black_18dp.png
new file mode 100644
index 0000000..6fbcc6d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phone_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_phone_black_18dp.png
new file mode 100644
index 0000000..d4077ac
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_email_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_email_black_18dp.png
new file mode 100644
index 0000000..0648fbd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000..17e8158
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_person_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_person_black_18dp.png
new file mode 100644
index 0000000..5e516bc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phone_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_phone_black_18dp.png
new file mode 100644
index 0000000..5dba808
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_email_black_18dp.png b/app/src/main/res/drawable-xxxhdpi/ic_email_black_18dp.png
new file mode 100644
index 0000000..3d13627
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 0000000..a7caa2d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_person_black_18dp.png b/app/src/main/res/drawable-xxxhdpi/ic_person_black_18dp.png
new file mode 100644
index 0000000..f1e1484
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_phone_black_18dp.png b/app/src/main/res/drawable-xxxhdpi/ic_phone_black_18dp.png
new file mode 100644
index 0000000..7c9d1b0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable/googleicon.png b/app/src/main/res/drawable/googleicon.png
new file mode 100644
index 0000000..708d4c3
Binary files /dev/null and b/app/src/main/res/drawable/googleicon.png differ
diff --git a/app/src/main/res/drawable/ic_email_black_18dp.png b/app/src/main/res/drawable/ic_email_black_18dp.png
new file mode 100644
index 0000000..ef03f95
Binary files /dev/null and b/app/src/main/res/drawable/ic_email_black_18dp.png differ
diff --git a/app/src/main/res/drawable/ic_lock_black_18dp.png b/app/src/main/res/drawable/ic_lock_black_18dp.png
new file mode 100644
index 0000000..f314292
Binary files /dev/null and b/app/src/main/res/drawable/ic_lock_black_18dp.png differ
diff --git a/app/src/main/res/drawable/ic_person_black_18dp.png b/app/src/main/res/drawable/ic_person_black_18dp.png
new file mode 100644
index 0000000..c19e355
Binary files /dev/null and b/app/src/main/res/drawable/ic_person_black_18dp.png differ
diff --git a/app/src/main/res/drawable/ic_phone_black_18dp.png b/app/src/main/res/drawable/ic_phone_black_18dp.png
new file mode 100644
index 0000000..8def1e0
Binary files /dev/null and b/app/src/main/res/drawable/ic_phone_black_18dp.png differ
diff --git a/app/src/main/res/drawable/ic_phonelink_ring_white_18dp.png b/app/src/main/res/drawable/ic_phonelink_ring_white_18dp.png
new file mode 100644
index 0000000..0f642ff
Binary files /dev/null and b/app/src/main/res/drawable/ic_phonelink_ring_white_18dp.png differ
diff --git a/app/src/main/res/drawable/onboarding_image_1.png b/app/src/main/res/drawable/onboarding_image_1.png
new file mode 100644
index 0000000..e7a08a1
Binary files /dev/null and b/app/src/main/res/drawable/onboarding_image_1.png differ
diff --git a/app/src/main/res/drawable/onboarding_image_2.png b/app/src/main/res/drawable/onboarding_image_2.png
new file mode 100644
index 0000000..e4e3b1f
Binary files /dev/null and b/app/src/main/res/drawable/onboarding_image_2.png differ
diff --git a/app/src/main/res/drawable/onboarding_image_3.png b/app/src/main/res/drawable/onboarding_image_3.png
new file mode 100644
index 0000000..f680138
Binary files /dev/null and b/app/src/main/res/drawable/onboarding_image_3.png differ
diff --git a/app/src/main/res/drawable/onboarding_image_4.png b/app/src/main/res/drawable/onboarding_image_4.png
new file mode 100644
index 0000000..c684025
Binary files /dev/null and b/app/src/main/res/drawable/onboarding_image_4.png differ
diff --git a/app/src/main/res/drawable/women.png b/app/src/main/res/drawable/women.png
new file mode 100644
index 0000000..eaf1cf9
Binary files /dev/null and b/app/src/main/res/drawable/women.png differ
diff --git a/app/src/main/res/layout/fragment_fake_call.xml b/app/src/main/res/layout/fragment_fake_call.xml
index a7c28ac..2f356e6 100644
--- a/app/src/main/res/layout/fragment_fake_call.xml
+++ b/app/src/main/res/layout/fragment_fake_call.xml
@@ -1,47 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_light"
     tools:context=".fragments.FakeCallFragment">
 
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <!-- TODO: Update blank fragment layout -->
+
 
-        <ImageButton
-            android:id="@+id/fragment_fake_call_button"
-            android:layout_width="@dimen/dimen_200dp"
-            android:layout_height="@dimen/dimen_200dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/sos_button"
-            android:src="@drawable/ic_call_black_36dp"
-            android:tint="@color/button_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/fragmentsBackgroudColor"
+        >
 
         <TextView
-            android:id="@+id/fragment_fake_call_label"
-            android:layout_width="200dp"
+            android:id="@+id/fakeCallTextView"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="120dp"
-            android:layout_marginStart="120dp"
-            android:layout_marginTop="32dp"
-            android:maxLines="2"
             android:text="@string/fake_call_label"
+            android:textSize="20sp"
             android:textAlignment="center"
+            android:layout_centerHorizontal="true"
             android:textColor="@color/colorPrimary"
-            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </android.support.constraint.ConstraintLayout>
+            android:layout_marginTop="50dp"
+            />
+
+        <ImageView
+            android:id="@+id/fakeCallImageButton"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:src="@drawable/onboarding_image_2"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@id/fakeCallTextView"
+            android:layout_marginTop="40dp"
+            />
+    </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sos.xml b/app/src/main/res/layout/fragment_sos.xml
index e0cd405..d9503c8 100644
--- a/app/src/main/res/layout/fragment_sos.xml
+++ b/app/src/main/res/layout/fragment_sos.xml
@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_light"
     tools:context=".fragments.SOSFragment">
 
-    <android.support.constraint.ConstraintLayout
+    <!-- TODO: Update blank fragment layout -->
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal|center_vertical"
+        android:gravity="center"
+        android:background="@color/fragmentsBackgroudColor"
+        >
 
-        <Button
-            android:id="@+id/fragment_sos_button"
-            android:layout_width="@dimen/dimen_200dp"
-            android:layout_height="@dimen/dimen_200dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/sos_button"
-            android:text="SOS"
-            android:textColor="@color/button_text"
-            android:textSize="24sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </android.support.constraint.ConstraintLayout>
+        <ImageView
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:src="@drawable/onboarding_image_2"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            />
+    </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_track_user.xml b/app/src/main/res/layout/fragment_track_user.xml
index 015bee5..5abe765 100644
--- a/app/src/main/res/layout/fragment_track_user.xml
+++ b/app/src/main/res/layout/fragment_track_user.xml
@@ -1,39 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".fragments.TrackUserFragment">
+    tools:context="fragments.TrackUserFragment">
 
-    <android.support.constraint.ConstraintLayout
+    <!-- TODO: Update blank fragment layout -->
+    <FrameLayout
+        android:id="@+id/mapView"
+        android:name="com.google.android.gms.maps.SupportMapFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:context=".MapsActivity" />
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@android:drawable/ic_menu_share"
+        android:layout_margin="16dp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="TRACK ME"
-            android:textSize="30sp" />
 
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fragment_track_share_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            android:src="@drawable/ic_share_white_36dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fragment_track_locate_me_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:src="@drawable/ic_my_location_white_36dp"
-            app:layout_constraintBottom_toTopOf="@+id/fragment_track_share_button"
-            app:layout_constraintEnd_toEndOf="@+id/fragment_track_share_button" />
-    </android.support.constraint.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/page_intro_activity.xml b/app/src/main/res/layout/page_intro_activity.xml
index bf8f3b2..0ba22ec 100644
--- a/app/src/main/res/layout/page_intro_activity.xml
+++ b/app/src/main/res/layout/page_intro_activity.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent" >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
@@ -11,40 +11,56 @@
         android:layout_height="match_parent" />
 
     <LinearLayout
-        android:id="@+id/layoutDots"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="20dp"
-        android:gravity="center"
-        android:orientation="horizontal"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:alpha=".5"
-        android:layout_above="@id/layoutDots"
-        android:background="@android:color/white" />
-
-    <Button
-        android:id="@+id/btn_next"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:background="@null"
-        android:text="@string/pager_next"
-        android:textColor="@android:color/white" />
-
-    <Button
-        android:id="@+id/btn_skip"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:background="@null"
-        android:text="@string/pager_skip"
-        android:textColor="@android:color/white" />
+        android:orientation="horizontal"
+        android:background="#66000000"
+        >
+
+        <Button
+            android:id="@+id/btn_skip"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/pager_skip"
+            android:textColor="@android:color/white"
+            android:layout_weight="1"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textSize="20sp"
+            android:paddingEnd="15dp"
+            android:paddingStart="15dp"
+            />
+
+        <LinearLayout
+            android:id="@+id/layoutDots"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical|center_horizontal"
+            android:orientation="horizontal">
+
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/btn_next"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:text="@string/pager_next"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textAlignment="viewEnd"
+            android:layout_weight="1"
+            android:paddingEnd="15dp"
+            android:paddingStart="15dp"
+            android:textSize="20sp"
+            />
 
+    </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml
index bead526..5b7b455 100644
--- a/app/src/main/res/values-gu-rIN/strings.xml
+++ b/app/src/main/res/values-gu-rIN/strings.xml
@@ -56,4 +56,13 @@
     <string name="processing">પ્રક્રિયા ચાલુ છે</string>
     <string name="api_not_connected_msg">The client attempted to call a method from an API that failed to connect.</string>
     <string name="fake_call_label">બટન દબાવ્યાંના ૧ મિનિટમાં બનાવટી કોલ આવશે </string>
+    <string name="pager_next">આગામી</string>
+    <string name="pager_skip">છોડો</string>
+    <string name="nirbheek_logo_content_description">નિરબઇક લોગો</string>
+    <string name="welcome_text_view">" નિરબીકમાં આપનું સ્વાગત છે"</string>
+    <string name="general_label">જનરલ</string>
+    <string name="advance_label">એડવાન્સ</string>
+    <string name="confirm_password_hint">" પાસવર્ડની પુષ્ટિ કરો"</string>
+    <string name="update_button">અપડેટ કરો</string>
+    <string name="change_password_button">" પાસવર્ડ બદલો"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 58d5b94..533230e 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -55,4 +55,14 @@
     <string name="password_required_msg">पासवर्ड जरूरी</string>
     <string name="phone_required_msg">फोन नम्बर जरूरी</string>
     <string name="enter_phone_msg">फोन नम्बर दर्ज करें</string>
+    <string name="fake_call_label">1 मिनट में नकली कॉल प्राप्त करने के लिए बटन टैप करें।</string>
+    <string name="pager_next">अगला</string>
+    <string name="pager_skip">" छोड़ें"</string>
+    <string name="nirbheek_logo_content_description">निर्बीक लोगो</string>
+    <string name="welcome_text_view">निर्भिक में आपका स्वागत है</string>
+    <string name="general_label">सामान्य</string>
+    <string name="advance_label">" पेशगी"</string>
+    <string name="confirm_password_hint">पासवर्ड की पुष्टि कीजिये</string>
+    <string name="update_button">अद्यतन करें</string>
+    <string name="change_password_button">" पासवर्ड बदलें"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml
index d2803bd..36c10e9 100644
--- a/app/src/main/res/values-pa-rIN/strings.xml
+++ b/app/src/main/res/values-pa-rIN/strings.xml
@@ -55,4 +55,14 @@
     <string name="account_creation_success">ਖਾਤਾ ਸਫਲਤਾਪੂਰਵਕ ਬਣਾਇਆ ਗਿਆ</string>
     <string name="processing">"ਪ੍ਰੋਸੈਸਿੰਗ"</string>
     <string name="login_success">"ਲਾਗਇਨ ਸਫਲ"</string>
+    <string name="fake_call_label">" 1 ਮਿੰਟ ਵਿੱਚ ਜਾਅਲੀ ਕਾਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਬਟਨ ਨੂੰ ਟੈਪ ਕਰੋ"</string>
+    <string name="pager_next">ਅਗਲਾ</string>
+    <string name="pager_skip">" ਛੱਡੋ"</string>
+    <string name="nirbheek_logo_content_description">" ਨਿਰਭੇਕ ਲੋਗੋ"</string>
+    <string name="welcome_text_view">ਨਿਰਭੀਕ ਵਿਚ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ</string>
+    <string name="general_label">ਜਨਰਲ</string>
+    <string name="advance_label">" ਐਡਵਾਂਸ"</string>
+    <string name="confirm_password_hint">" ਪਾਸਵਰਡ ਪੱਕਾ ਕਰੋ"</string>
+    <string name="update_button">ਅੱਪਡੇਟ ਕਰੋ</string>
+    <string name="change_password_button">ਪਾਸਵਰਡ ਬਦਲੋ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
index 14a070f..117684f 100644
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ b/app/src/main/res/values-ta-rIN/strings.xml
@@ -55,4 +55,14 @@
     <string name="login_success">உள்நுழைவு வெற்றி கண்டது</string>
     <string name="welcome_to_nirbheek">நிர்பீக் உங்களை வரவேற்கிறது</string>
     <string name="implementation_in_progress">முன்னேற்றம் நடைமுறையில் உள்ளது</string>
+    <string name="fake_call_label">" 1 நிமிடத்தில் போலி அழைப்பைப் பெற பொத்தானைத் தட்டவும்."</string>
+    <string name="pager_next">" அடுத்த"</string>
+    <string name="pager_skip">தவிர்க்க</string>
+    <string name="nirbheek_logo_content_description">Nirbheek லோகோ</string>
+    <string name="welcome_text_view">" Nirbheek க்கு வரவேற்கிறோம்"</string>
+    <string name="general_label">பொது</string>
+    <string name="advance_label">Aṭvāṉs</string>
+    <string name="confirm_password_hint">கடவுச்சொல்லை உறுதிப்படுத்துக</string>
+    <string name="update_button">புதுப்பிக்கப்பட்டது</string>
+    <string name="change_password_button">" கடவுச்சொல்லை மாற்று"</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e307613..605e7c0 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,15 @@
     <color name="colorPrimary">#673ab7</color>
     <color name="colorPrimaryDark">#4527A0</color>
     <color name="colorAccent">#ff4081</color>
+    <color name="colorButton">#03a9f4</color>
+    <color name="fragmentsBackgroudColor">#DCD2EE</color>
+
+    <!-- Screens background color-->
+    <color name="bg_screen1">#03a9f4</color>
+    <color name="bg_screen2">#90A4AE</color>
+    <color name="bg_screen3">#E91E63</color>
+    <color name="bg_screen4">#FFC107</color>
+    <array name="array_dot_active"/>
     <!-- Background colours for onboarding screens -->
     <color name="screen1">#03A9F4</color>
     <color name="screen2">#90A4AE</color>
@@ -29,7 +38,7 @@
         <item>@color/dot_light_screen3</item>
         <item>@color/dot_light_screen4</item>
     </array>
-
+    <array name="array_dot_inactive"/>
     <array name="dot_inactive">
         <item>@color/dot_dark_screen1</item>
         <item>@color/dot_dark_screen2</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 788230f..d0eb0d9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,6 +16,15 @@
     <dimen name="dimen_4dp">4dp</dimen>
     <dimen name="dimen_8dp">8dp</dimen>
     <dimen name="dimen_16dp">16dp</dimen>
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="dots_height">40dp</dimen>
+    <dimen name="dots_margin_bottom">20dp</dimen>
+    <dimen name="img_width_height">260dp</dimen>
+    <dimen name="slide_title">30sp</dimen>
+    <dimen name="slide_desc">14sp</dimen>
+    <dimen name="desc_padding">40dp</dimen>
     <dimen name="dimen_15dp">15dp</dimen>
 
     <dimen name="dimen_12sp">12sp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 95a472a..53fb1a1 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,6 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
diff --git a/app/src/release/res/values/google_maps_api.xml b/app/src/release/res/values/google_maps_api.xml
new file mode 100644
index 0000000..1ef79e9
--- /dev/null
+++ b/app/src/release/res/values/google_maps_api.xml
@@ -0,0 +1,20 @@
+<resources>
+    <!--
+    TODO: Before you release your application, you need a Google Maps API key.
+
+    To do this, you can either add your release key credentials to your existing
+    key, or create a new key.
+
+    Note that this file specifies the API key for the release build target.
+    If you have previously set up a key for the debug target with the debug signing certificate,
+    you will also need to set up a key for your release certificate.
+
+    Follow the directions here:
+
+    https://developers.google.com/maps/documentation/android/signup
+
+    Once you have your key (it starts with "AIza"), replace the "google_maps_key"
+    string in this file.
+    -->
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">YOUR_KEY_HERE</string>
+</resources>