diff --git a/.run/Client and Server.run.xml b/.run/Client and Server.run.xml
new file mode 100644
index 0000000..f378434
--- /dev/null
+++ b/.run/Client and Server.run.xml	
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Client and Server" type="CompoundRunConfigurationType">
+    <toRun name="Content.Client" type="DotNetProject" />
+    <toRun name="Content.Server" type="DotNetProject" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/RobustToolbox b/RobustToolbox
index ef0bc1a..17ad80a 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit ef0bc1a2e4878eedc24dd6fedc0631be56aca072
+Subproject commit 17ad80a7ef9d3470bd903e2bc1c77bd4d7387aa1