Merge branch 'master' into rename_client

Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h

src/gui/socketapi.cpp

@@ -94,6 +94,11 @@ SocketApi::SocketApi(QObject* parent)
         runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
 #else
         runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
+        if (runtimeDir.isEmpty()) {
+            runtimeDir = QDir::tempPath() + QLatin1String("/runtime-")
+                + QString::fromLocal8Bit(qgetenv("USER"));
+            QDir().mkdir(runtimeDir);
+        }
 #endif
         socketPath = runtimeDir + "/" + Theme::instance()->appName() + "/socket";
     } else {