Merge remote-tracking branch 'origin/master'

Conflicts:
	shadowsocks-csharp/Controller/ShadowsocksController.cs
	shadowsocks-csharp/Model/Configuration.cs
	shadowsocks-csharp/View/AboutForm.cs
	shadowsocks-csharp/shadowsocks-csharp.csproj

shadowsocks-csharp/Controller/PACServer.cs

@@ -15,7 +15,6 @@ namespace Shadowsocks.Controller
     {
         private static int PORT = 8090;
         private static string PAC_FILE = "pac.txt";
-        public bool openOnLan;
 
         Socket _listener;
         FileSystemWatcher watcher;

shadowsocks-csharp/Controller/PolipoRunner.cs

@@ -12,7 +12,6 @@ namespace Shadowsocks.Controller
     class PolipoRunner
     {
         private Process _process;
-        public bool openOnLan;
 
         public void Start(Configuration configuration)
         {
@@ -32,10 +31,10 @@ namespace Shadowsocks.Controller
                         Console.WriteLine(e.ToString());
                     }
                 }
-                string temppath = Path.GetTempPath();
+                string temppath = Path.GetTempPath();
                 string polipoConfig = Resources.polipo_config; 
                 polipoConfig = polipoConfig.Replace("__SOCKS_PORT__", server.local_port.ToString());
-                polipoConfig = polipoConfig.Replace("__POLIPO_BIND_IP__", configuration.shareOverLan ? "0.0.0.0" : "127.0.0.1");
+                polipoConfig = polipoConfig.Replace("__POLIPO_BIND_IP__", configuration.shareOverLan ? "0.0.0.0" : "127.0.0.1");
                 FileManager.ByteArrayToFile(temppath + "/polipo.conf", System.Text.Encoding.UTF8.GetBytes(polipoConfig));
                 FileManager.UncompressFile(temppath + "/ss_polipo.exe", Resources.polipo_exe);
 

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -59,8 +59,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />