Merge branch 'develop' into travis/mjolnir

riot.im/app/config.json

@@ -25,8 +25,6 @@
         }
     },
     "features": {
-        "feature_lazyloading": "enable",
-        "feature_room_breadcrumbs": "labs"
     },
     "roomDirectory": {
         "servers": [

riot.im/develop/config.json

@@ -13,22 +13,14 @@
     "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
-        "feature_rich_quoting": "labs",
         "feature_pinning": "labs",
-        "feature_presence_management": "labs",
-        "feature_sticker_messages": "labs",
-        "feature_jitsi": "labs",
-        "feature_tag_panel": "enable",
-        "feature_keybackup": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
-        "feature_lazyloading": "enable",
-        "feature_tabbed_settings": "labs",
-        "feature_sas": "labs",
-        "feature_room_breadcrumbs": "labs",
         "feature_state_counters": "labs",
         "feature_many_integration_managers": "labs",
         "feature_mjolnir": "labs"
+        "feature_user_info_panel": "labs",
+        "feature_dm_verification": "labs"
     },
     "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {