Merge branch 'master' of D:\AndroidProject\knuhConsent with conflicts.

.idea/misc.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK" />
 </project>

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

@@ -112,7 +112,6 @@
         android:layout_height="match_parent"
         android:layout_margin="8dp">
 
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/searchRecyclerView"
             android:layout_width="match_parent"