Merge changes

app/src/main/AndroidManifest.xml

@@ -52,7 +52,6 @@
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/*" />
-                <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
 

app/src/main/java/de/baumann/diaspora/MainActivity.java

@@ -763,7 +763,6 @@ public class MainActivity extends AppCompatActivity
                     if (item != null) {
                         if (conversationCount > 0) {
                             item.setIcon(R.drawable.ic_message_text_white_24dp);
-                            item.setIcon(R.drawable.ic_bell_ring_white_24dp);
                             Snackbar snackbar = Snackbar
                                     .make(swipeView, R.string.new_conversations, Snackbar.LENGTH_INDEFINITE)
                                     .setAction(R.string.yes, new View.OnClickListener() {