Merge branch 'mlaux-bugfix/android-launcher-intent'

android/app/src/main/AndroidManifest.xml

@@ -29,10 +29,12 @@
         android:name=".MainActivity">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+        <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.BROWSABLE" />
             <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.LAUNCHER" />
             <data android:host="beta.meet.jit.si" android:scheme="https" />
             <data android:host="chaos.hipchat.me" android:scheme="https" />
             <data android:host="enso.me" android:scheme="https" />

react/features/base/fontIcons/Icon.js

@@ -2,7 +2,7 @@
 // but the file's name and/or location (within the directory structure) don't
 // reflect that, it suggests the file is platform-independent.
 import { createIconSetFromIcoMoon } from 'react-native-vector-icons';
-import icoMoonConfig from './fonts/selection.json';
+import icoMoonConfig from './jitsi.json';
 
 /**
  * Creates the Jitsi icon set from the ico moon project config file.