Merge branch 'master' into qml-singleton-style and fix merge conflict

Migrate changes in client.qrc to resources.qrc

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --cc resources.qrc
index 0000000000000000000000000000000000000000,60e0f0a6ecc1c925d38f89df65ec2186e0a1e940..6ea8bb8fc1a1e9bdbcf2f6f477ced52348859592
mode 000000,100644..100644
--- /dev/null
--- 2/resources.qrc
+++ b/resources.qrc
@@@ -1,0 -1,6 +1,8 @@@
+ <RCC>
+     <qresource prefix="/qml">
+         <file>src/gui/tray/Window.qml</file>
+         <file>src/gui/tray/UserLine.qml</file>
++        <file>theme/Style/Style.qml</file>
++        <file>theme/Style/qmldir</file>
+     </qresource>
+ </RCC>

diff --cc src/gui/CMakeLists.txt
Simple merge

diff --cc src/gui/tray/UserLine.qml
Simple merge

diff --cc src/gui/tray/Window.qml
Simple merge