diff --git a/fxttipe0.oib.txt b/fxttipe0.oib.txt
new file mode 100644
index 000000000..dcad16ceb
--- /dev/null
+++ b/fxttipe0.oib.txt
@@ -0,0 +1,33 @@
+Merge branch 'development'
+
+# Conflicts:
+#	README.md
+#	sonoff/_releasenotes.ino
+#	sonoff/sonoff.ino
+#	sonoff/xdrv_snfled.ino
+#	sonoff/xdrv_ws2812.ino
+#
+# It looks like you may be committing a merge.
+# If this is not correct, please remove the file
+#	.git/MERGE_HEAD
+# and try again.
+
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# On branch master
+# Your branch is up-to-date with 'origin/master'.
+#
+# All conflicts fixed but you are still merging.
+#
+# Changes to be committed:
+#	modified:   README.md
+#	modified:   sonoff/_releasenotes.ino
+#	modified:   sonoff/sonoff.ino
+#	modified:   sonoff/webserver.ino
+#	modified:   sonoff/xdrv_snfled.ino
+#	modified:   sonoff/xdrv_wemohue.ino
+#	modified:   sonoff/xdrv_ws2812.ino
+#
+
+
diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino
index b1a65feb0..c33aea731 100644
--- a/sonoff/webserver.ino
+++ b/sonoff/webserver.ino
@@ -102,7 +102,7 @@ const char HTTP_SCRIPT_CONSOL[] PROGMEM =
     "t=document.getElementById('t1');"
     "if(p==1){"
       "c=document.getElementById('c1');"
-      "o='&c1='+encodeURI(c.value);"
+      "o='&c1='+encodeURIComponent(c.value);"
       "c.value='';"
       "t.scrollTop=sn;"
     "}"
diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino
index a331ed577..10fc809a1 100644
--- a/sonoff/xdrv_wemohue.ino
+++ b/sonoff/xdrv_wemohue.ino
@@ -99,7 +99,7 @@ const char HUE_RESPONSE[] PROGMEM =
   "CACHE-CONTROL: max-age=100\r\n"
   "EXT:\r\n"
   "LOCATION: http://{r1}:80/description.xml\r\n"
-  "SERVER: FreeRTOS/7.4.2 UPnP/1.0 IpBridge/1.16.0\r\n"
+  "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.17.0\r\n"
   "hue-bridgeid: {r2}\r\n";
 const char HUE_ST1[] PROGMEM =
   "ST: upnp:rootdevice\r\n"
@@ -110,7 +110,7 @@ const char HUE_ST2[] PROGMEM =
   "USN: uuid:{r3}\r\n"
   "\r\n";
 const char HUE_ST3[] PROGMEM =
-  "ST: urn:schemas-upnp-org:device:Basic:1\r\n"
+  "ST: urn:schemas-upnp-org:device:basic:1\r\n"
   "USN: uuid:{r3}\r\n"
   "\r\n";
 
@@ -400,8 +400,8 @@ const char HUE_CONFIG_RESPONSE_JSON[] PROGMEM =
      "\"last use date\":\"{dt}\","
      "\"create date\":\"{dt}\","
      "\"name\":\"Remote\"}},"
-   "\"swversion\":\"01036659\","
-   "\"apiversion\":\"1.16.0\","
+   "\"swversion\":\"01039019\","
+   "\"apiversion\":\"1.17.0\","
    "\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
    "\"linkbutton\":false,"
    "\"portalservices\":false"