Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir

Conflicts:
	src/gui/folderman.cpp

src/gui/application.cpp

@@ -151,9 +151,6 @@ Application::Application(int &argc, char **argv) :
     }
 
     connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
-
-    _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket"))));
-
 }
 
 Application::~Application()