Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

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

@@ -11,24 +11,28 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingStart="24dp"
+    android:gravity="center_vertical"
     android:paddingEnd="24dp"
-    android:gravity="center_vertical">
+    android:paddingStart="24dp"
+     >
 
     <ImageView
       android:id="@+id/button_back"
       android:layout_width="35dp"
       android:layout_height="35dp"
       android:contentDescription="@string/previous_page"
-      android:padding="10dp"
+      android:paddingTop="10dp"
+      android:paddingRight="10dp"
+      android:paddingBottom="10dp"
+      android:paddingLeft="-10dp"
       android:src="@drawable/icon_header_back"/>
 
     <TextView
       android:id="@+id/action_bar_title"
       android:layout_width="0dp"
       android:layout_height="56dp"
-      android:layout_marginStart="18dp"
       android:layout_marginEnd="18dp"
+      android:layout_marginStart="18dp"
       android:layout_weight="1"
       android:gravity="center"
       android:textColor="@color/C000000"

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

@@ -15,6 +15,7 @@
     android:layout_marginLeft="25dp"
     android:layout_marginTop="25dp"
     android:layout_marginRight="25dp"
+    android:layout_marginBottom="25dp"
     android:divider="@color/CFFFFFF"
     android:dividerHeight="50dp">
 

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

@@ -246,10 +246,15 @@
       android:src="@drawable/icon_detail_arrow"/>
   </LinearLayout>
 
+  <Space
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="189dp"
+    android:layout_marginBottom="35dp"
     android:gravity="center"
     >