Merge branch 'master' into commercial

lib/handlers.js

@@ -120,7 +120,7 @@ module.exports.create = function (state) {
     serveAdmin(req, res, finalhandler(req, res));
   };
   state.httpTunnelServer = http.createServer(function (req, res) {
-    //res.setHeader('connection', 'close');
+    res.setHeader('connection', 'close');
     if (state.extensions.webadmin) {
       state.extensions.webadmin(state, req, res);
     } else {

lib/relay.js

@@ -113,8 +113,6 @@ module.exports.create = function (state) {
       });
     }
 
-    function next() {
-
     function logName() {
       var result = Object.keys(remotes).map(function (jwtoken) {
         return remotes[jwtoken].deviceId;
@@ -335,6 +333,7 @@ module.exports.create = function (state) {
       return null;
     }
 
+    function next() {
       var commandHandlers = {
         add_token: addToken
       , auth: addToken