fixed merge conflicts

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -230,6 +230,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
                             mItemPosition = -1;
                             registerListClickCallback(RecordOverviewFragment.this.expListView);
                             RecordOverviewFragment.this.spinner.setVisibility(View.GONE);
+                            RecordOverviewFragment.this.actualiseFilterButton();
                         }
                     });
                 }
@@ -250,6 +251,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
         });
 
         loader.start();
+
+        this.actualiseFilterButton();
     }