Merge remote-tracking branch 'origin/master'

Conflicts:
	shadowsocks-csharp/Controller/ShadowsocksController.cs
	shadowsocks-csharp/View/ConfigForm.cs

shadowsocks-csharp/Controller/ShadowsocksController.cs

@@ -19,6 +19,7 @@ namespace Shadowsocks.Controller
         private Configuration _config;
         private PolipoRunner polipoRunner;
         private bool stopped = false;
+        private bool openOnLan;
 
         public class PathEventArgs : EventArgs
         {
@@ -39,16 +40,16 @@ namespace Shadowsocks.Controller
             {
                 SetLog();
             }
-
-            polipoRunner = new PolipoRunner();
+
+            polipoRunner = new PolipoRunner();
             polipoRunner.Start(_config);
-            local = new Local(_config);
+            local = new Local(_config);
             try
             {
                 local.Start();
                 pacServer = new PACServer();
-                pacServer.PACFileChanged += pacServer_PACFileChanged;
-                pacServer.Start(_config);
+                pacServer.PACFileChanged += pacServer_PACFileChanged;
+                pacServer.Start(_config);
             }
             catch (Exception e)
             {
@@ -57,7 +58,7 @@ namespace Shadowsocks.Controller
 
             UpdateSystemProxy();
         }
-
+        
         public Server GetCurrentServer()
         {
             return _config.GetCurrentServer();

shadowsocks-csharp/View/ConfigForm.cs

@@ -280,8 +280,8 @@ namespace Shadowsocks.View
             {
                 MessageBox.Show("Please add at least one server");
                 return;
-            }
-            controller.SaveServers(_modifiedConfiguration.configs, _modifiedConfiguration.noChange);
+            }
+            controller.SaveServers(_modifiedConfiguration.configs, _modifiedConfiguration.noChange);
             this.Hide();
             ShowFirstTimeBalloon();
         }