合并分支 jiangtianxiang_branch，解决界面布局冲突

src/Notesmaster/app/src/main/res/layout/note_edit.xml

@@ -19,6 +19,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/list_background"
+    android:fitsSystemWindows="true"
+    android:paddingTop="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout

src/Notesmaster/app/src/main/res/layout/note_list.xml

@@ -19,7 +19,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/list_background">
+    android:background="@drawable/list_background"
+    android:fitsSystemWindows="true"
+    android:paddingTop="24dp">
 
     <LinearLayout
         android:layout_width="fill_parent"