Merge branch 'master' into dev

README.md

@@ -1,27 +1,26 @@
 Wox   [![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e103)](https://ci.appveyor.com/project/qianlifeng/wox) [![Bountysource](https://www.bountysource.com/badge/team?team_id=39433&style=raised)](https://www.bountysource.com/teams/wox?utm_source=Wox&utm_medium=shield&utm_campaign=raised)
 =========
-[Wox](http://www.getwox.com) is a launcher for windows, inspired by [Alfred](http://www.alfredapp.com/) and [Launchy](http://www.launchy.net/). You can launch everything with just a few keystrokes!.
+[Wox](https://www.getwox.com/) is a launcher for Windows, inspired by [Alfred](https://www.alfredapp.com/) and [Launchy](http://www.launchy.net/). You can launch everything with just a few keystrokes!.
 
 Features
 =========
 1. Search all applications, folders, files, [bookmarks](https://www.getwox.com/plugin/16).
 2. Search Web using keyword (e.g. search google with `g search_term`)
-3. Build custom themes in [http://www.getwox.com/theme/builder](http://www.getwox.com/theme/builder)
+3. Build custom themes in [https://www.getwox.com/theme/builder](https://www.getwox.com/theme/builder)
-4. Install plugins from [http://www.getwox.com/plugin](http://www.getwox.com/plugin)
+4. Install plugins from [https://www.getwox.com/plugin](https://www.getwox.com/plugin)
 
 Screenshot
 =========
 
-<a href="https://github.com/qianlifeng/Wox/wiki/Screenshot">More screenshot</a>
+<a href="https://github.com/Wox-launcher/Wox/wiki/Screenshot">More screenshots</a>
 <img src="http://ww3.sinaimg.cn/large/dce48faejw1eihx6ffo8eg20zk0m8hdt.gif" />
 
 Installation
 =========
 
 1. Download
-  1. Latest stable version: [release page](https://github.com/qianlifeng/Wox/releases).
+  1. Latest stable version: [release page](https://github.com/Wox-launcher/Wox/releases).
-  2. Latest build: [history](https://ci.appveyor.com/project/qianlifeng/wox/history)
+  2. Latest build: [English guide](https://github.com/Wox-launcher/Wox/wiki/FAQ-English#how-to-install-latest-build),  [中文说明](https://github.com/Wox-launcher/Wox/wiki/FAQ-%E4%B8%AD%E6%96%87#%E5%A6%82%E4%BD%95%E5%AE%89%E8%A3%85%E6%9C%80%E6%96%B0-build)
-     (top green build -> artifacts -> release-binary.zip).
 2. Unzip it and put it into your user directory (`C:\Users\YOUUSERNAME` or `%userprofile%`)
 3. Windows 10 user, please have a look at https://github.com/Wox-launcher/Wox/issues/279
 
@@ -30,12 +29,11 @@ Simple Usage
 =========
 - Launch: <kbd>Alt</kbd>+<kbd>Space</kbd>
 - Install/Uninstall plugin: type `wpm install/uninstall`
-- Remember type `restart` to restarat Wox after installation of a plugin
 
 Contribute  
 =========
 
-If you are a developer, please feel free to send a pull request to the **Dev** branch. We still have a lot of features and bugs to resolve. Take a look at [issues page](https://github.com/qianlifeng/Wox/issues) if you want to contribute :)
+If you are a developer, please feel free to send a pull request to the **Dev** branch. We still have a lot of features and bugs to resolve. Take a look at [issues page](https://github.com/Wox-launcher/Wox/issues) if you want to contribute :)
 
 If you are not a developer, please install the [Latest build](https://ci.appveyor.com/project/qianlifeng/wox/history) and report bugs (how to: [English](https://github.com/Wox-launcher/Wox/wiki/FAQ-English) [中文](https://github.com/Wox-launcher/Wox/wiki/FAQ-%E4%B8%AD%E6%96%87)). Feedback is always welcome!
 

Wox/Wox.csproj

@@ -15,6 +15,7 @@
     <WarningLevel>4</WarningLevel>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>发布\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,7 +28,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>