Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

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

@@ -54,7 +54,7 @@
         android:textSize="20dp"
         android:textColorHint = "@color/hint_color"
         android:layout_marginTop = "15dp"
-        android:layout_below = "@+id/title"
+        android:layout_below = "@+id/date"
         android:layout_alignParentLeft = "true"
         android:layout_alignParentStart = "true"
         android:layout_alignParentRight = "true"
@@ -71,7 +71,7 @@
         android:textColorHighlight = "#ff7eff15"
         android:textColorHint = "@color/hint_color"
         android:layout_marginTop = "15dp"
-        android:layout_below = "@+id/place"
+        android:layout_below = "@+id/title"
         android:layout_alignParentLeft = "true"
         android:layout_alignParentStart = "true"
         android:layout_alignParentRight = "true"

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

@@ -43,16 +43,18 @@
         android:layout_alignParentRight = "true"
         android:layout_alignParentEnd = "true"
         />
-    <EditText
+    <TextView
         android:layout_width = "wrap_content"
         android:layout_height = "wrap_content"
         android:id = "@+id/place"
+        android:layout_marginLeft="5dp"
+        android:textSize="20dp"
         android:hint = "@string/place"
         android:focusable = "true"
         android:textColorHighlight = "#ff7eff15"
         android:textColorHint = "@color/hint_color"
         android:layout_marginTop = "15dp"
-        android:layout_below = "@+id/title"
+        android:layout_below = "@+id/date"
         android:layout_alignParentLeft = "true"
         android:layout_alignParentStart = "true"
         android:layout_alignParentRight = "true"
@@ -69,7 +71,7 @@
         android:textColorHighlight = "#ff7eff15"
         android:textColorHint = "@color/hint_color"
         android:layout_marginTop = "15dp"
-        android:layout_below = "@+id/place"
+        android:layout_below = "@+id/title"
         android:layout_alignParentLeft = "true"
         android:layout_alignParentStart = "true"
         android:layout_alignParentRight = "true"

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

@@ -15,7 +15,7 @@
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Select1"
+        android:text="Select"
         android:id="@+id/select_location"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"