diff --git a/config/config.properties b/config/config.properties
index c4999096..d51f66a7 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Wed Oct 18 15:41:39 CEST 2017
+#Tue Oct 24 09:59:39 CEST 2017
 autoSaveScanData=true
 createSessionFiles=false
 dataLayout=default
@@ -16,6 +16,7 @@ logDaysToLive=-1
 logLevel=Fine
 logLevelConsole=Off
 logPath={logs}/{date}_{time}
+notificationLevel=null
 scanStreamerPort=-1
 scanStreamingPort=-1
 scriptType=py
diff --git a/config/mail.properties b/config/mail.properties
new file mode 100644
index 00000000..1dffebf6
--- /dev/null
+++ b/config/mail.properties
@@ -0,0 +1,9 @@
+#Tue Oct 24 09:59:43 CEST 2017
+auth=None
+from=
+host=
+port=0
+pwd=
+smsSuffix=@sms.switch.ch
+to=
+usr=
diff --git a/devices/ExitSlitY.properties b/devices/ExitSlitY.properties
index f0502d29..b5b5790f 100644
--- a/devices/ExitSlitY.properties
+++ b/devices/ExitSlitY.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:20 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 defaultSpeed=0.4
 estbilizationDelay=0
 hasEnable=false
@@ -12,4 +12,5 @@ precision=5
 resolution=0.002
 rotation=false
 scale=1.0
+startRetries=1
 unit=mm
diff --git a/devices/ManipulatorPhi.properties b/devices/ManipulatorPhi.properties
index e9455f80..10e8f661 100644
--- a/devices/ManipulatorPhi.properties
+++ b/devices/ManipulatorPhi.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:19 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=6.0
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.5
 rotation=false
 scale=1.0
+startRetries=1
 unit=deg
diff --git a/devices/ManipulatorTheta.properties b/devices/ManipulatorTheta.properties
index e4b5fc66..a9c68beb 100644
--- a/devices/ManipulatorTheta.properties
+++ b/devices/ManipulatorTheta.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:19 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=0.5
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.1
 rotation=false
 scale=1.0
+startRetries=1
 unit=deg
diff --git a/devices/ManipulatorTilt.properties b/devices/ManipulatorTilt.properties
index 3d865594..1b774300 100644
--- a/devices/ManipulatorTilt.properties
+++ b/devices/ManipulatorTilt.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:19 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=1.4
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.02
 rotation=false
 scale=1.0
+startRetries=1
 unit=deg
diff --git a/devices/ManipulatorX.properties b/devices/ManipulatorX.properties
index 4ddaf81b..03b85a91 100644
--- a/devices/ManipulatorX.properties
+++ b/devices/ManipulatorX.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:19 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=0.126
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.01
 rotation=false
 scale=1.0
+startRetries=1
 unit=mm
diff --git a/devices/ManipulatorY.properties b/devices/ManipulatorY.properties
index 7d72f691..3b069156 100644
--- a/devices/ManipulatorY.properties
+++ b/devices/ManipulatorY.properties
@@ -1,4 +1,4 @@
-#Thu Sep 21 16:15:27 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=0.126
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.01
 rotation=false
 scale=1.0
+startRetries=1
 unit=mm
diff --git a/devices/ManipulatorZ.properties b/devices/ManipulatorZ.properties
index 8abb3c8e..b12c3107 100644
--- a/devices/ManipulatorZ.properties
+++ b/devices/ManipulatorZ.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:19 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=1.0
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=4
 resolution=0.01
 rotation=false
 scale=1.0
+startRetries=1
 unit=mm
diff --git a/devices/dummy.properties b/devices/dummy.properties
index 15b86da6..8f0721af 100644
--- a/devices/dummy.properties
+++ b/devices/dummy.properties
@@ -1,4 +1,4 @@
-#Mon Aug 21 10:43:20 CEST 2017
+#Tue Oct 24 09:59:43 CEST 2017
 accessType=ReadWrite
 defaultSpeed=1.0
 estbilizationDelay=0
@@ -13,4 +13,5 @@ precision=3
 resolution=NaN
 rotation=false
 scale=1.0
+startRetries=1
 unit=