Merge branch 'dev_1.0.0' of http://gitlab.mints-id.com/android/android_street into branche_zsf

app/src/main/res/layout/activity_aboutus.xml

@@ -92,7 +92,7 @@
                         android:layout_marginLeft="30dp"
                         android:layout_marginRight="30dp"
                         android:gravity="center"
-                        android:text="Copyright © 2019 Inc.."
+                        android:text="Copyright © 2019-2021 Inc.."
                         android:textColor="@color/color_333"
                         android:textSize="12sp" />
                 </LinearLayout>

app/src/main/res/layout/activity_moresettings.xml

@@ -15,18 +15,6 @@
 
         <include layout="@layout/include_header" />
 
-        <com.mints.street.widget.ElasticScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:overScrollMode="never">
-
-            <LinearLayout
-                android:id="@+id/ly_linear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:elevation="5dp"
-                android:orientation="vertical">
-
         <include
             android:id="@+id/item_phone"
             layout="@layout/item_settings" />
@@ -69,8 +57,4 @@
             android:layout_height="wrap_content"/>
 
     </LinearLayout>
-
-        </com.mints.street.widget.ElasticScrollView>
-
-    </LinearLayout>
 </layout>
\ No newline at end of file