Merged master / fixed merge conflict

lib/Config/Initializer.php

@@ -2,6 +2,7 @@
 namespace MailPoet\Config;
 
 use MailPoet\Models;
+use MailPoet\Router;
 
 if (!defined('ABSPATH')) exit;
 
@@ -19,6 +20,7 @@ class Initializer {
     $this->setupRenderer();
     $this->setupLocalizer();
     $this->setupMenu();
+    $this->setupRouter();
   }
 
   function setupDB() {
@@ -57,4 +59,9 @@ class Initializer {
     );
     $menu->init();
   }
+
+  function setupRouter() {
+    $router = new Router\Router();
+    $router->init();
+  }
 }