diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
new file mode 100644
index 0000000..c2abfb4
--- /dev/null
+++ b/.vs/config/applicationhost.config
@@ -0,0 +1,1030 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..37bcd41
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,42 @@
+# Changelog
+
+These are the changes to each version that has been released
+on the official Visual Studio extension gallery.
+
+## 1.5
+
+- Better support for Unicorn 3.1
+- Configuration status messages
+- Search in logs
+- Copy log entry to clipboard
+
+**BREAKING CHANGES**
+
+In Unicorn 3.1 "/unicornRemote.aspx" was removed, now you can use "/unicorn.aspx".
+Please make sure to update your settings.
+
+## 1.4
+
+- Support for upcoming changes in Unicorn 3.1
+- Progress status is now displayed in VS status bar
+
+## 1.3
+
+- fixed issue with "Configurations dropdown doesn't update after fixing a broken connection"
+- fixed issue "Cannot connect using Deployment Token"
+- added settings window to change remote URL.
+- support for arbitrary multiple config selections (need to be enabled in settings)
+
+## 1.2.1
+
+- Update for menu icon
+
+## 1.2
+
+- fixed warning prompting to update Unicorn.Remote.dll if using Unicorn 3.0 or above
+- new official icon
+
+## 1.1
+
+- using streaming instead of polling
+- JSON.NET is removed from a dependencies list.
\ No newline at end of file
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..94f4c18
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+### Installed product versions
+- Visual Studio: [example 2015 Professional]
+- This extension: [example 1.5]
+- Unicorn: [example 3.1]
+- Sitecore: [example 8.1]
+
+### Description
+Replace this text with a short description
+
+### Steps to recreate
+1. Replace this
+2. text with
+3. the steps
+4. to recreate
+
+### Current behavior
+Explain what it's doing and why it's wrong
+
+### Expected behavior
+Explain what it should be doing after it's fixed.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..369c121
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2016 Andrii Snihyr
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/README.md b/README.md
index 2f94dda..da102ce 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,56 @@
-# Unicorn.VisualStudio
-Visual Studio plugin for https://github.com/kamsar/Unicorn
+# Unicorn Control Panel
-Read more on Wiki(https://github.com/BerserkerDotNet/Unicorn.VisualStudio/wiki)
+
+
+---------------------------------------
+
+Allows you to use [Unicorn](https://github.com/kamsar/Unicorn) from Visual Studio.
+With this extension you can synchronize your Sitecore items without leaving Visual Studio.
+
+
+
+See the [changelog](CHANGELOG.md) for changes and roadmap.
+
+## Connecting to Unicorn
+
+For control panel to work, you have to provide connection information about Sitecore instance you want to use control panel with.
+Unicorn Control Panel requires that Unicorn version 2.0.4 or 3 (rc2 or later) to be installed on the instance. (https://www.nuget.org/packages/Unicorn)
+
+To create new connection follow the steps:
+
+1. Click on the "Create New Connection" button to add connection
+
+1. Specify connection info: Name, Server Url and [Security token/SharedSecret](https://github.com/kamsar/Unicorn#automated-deployment) if needed.
+1. Click "Save"
+
+
+
+### Unicorn 2.x
+
+Click on install and specify a path to Sitecore webroot folder. Unicorn.Remote.dll and Unicorn.Remote.config will be copied to your Sitecore instance.
+If you don't have an access to Webroot folder you can download a package and install it.
+
+### Unicorn 3.x
+
+In Unicorn 3+ remote API is disabled by default, to enable it, remove "disabled" extension from `App_Config/Include/Unicorn/Unicorn.Remote.config.disabled` file.
+
+### Unicron 3.1
+
+In this version remote API endpoint (/unicornRemote.aspx) was removed, VS control panel can now access Unicorn directly by it standard endpoint (/unicorn.aspx).
+Please make sure to change it in your settings. (Settings -> EndPoint URL).
+
+## Settings
+
+
+Settings has following options:
+
+1. EndPoint - used to specify the custom endpoint of Unicorn server.
+Default value is "/unicornRemote.aspx". (/unicorn.aspx for Unicorn 3.1)
+NOTE: This value should correspond to the value set in Unicorn.Remote.config
+1. "Enable multiple configurations selection" - if selected allows you to select multiple configurations for sync.
+1. "Check for configuration health" option allows you to turn on/off a check for configuration state.
+You want to turn it off if your version of Unicorn does not support it. (supported from 3.1+).
+This option is enabled by default.
+
+## License
+[Apache 2.0](LICENSE)
\ No newline at end of file
diff --git a/Unicorn.Remote.sln b/Unicorn.Remote.sln
index 6ad14b0..420e31e 100644
--- a/Unicorn.Remote.sln
+++ b/Unicorn.Remote.sln
@@ -11,6 +11,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MicroCHAP", "..\MicroCHAP\s
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unicorn.Emulator", "src\Unicorn.Emulator\Unicorn.Emulator.csproj", "{1212653F-C437-419A-A449-6544C2D6EB5C}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CF0DFC3-589D-4FE2-8F08-E33B93CE3E9B}"
+ ProjectSection(SolutionItems) = preProject
+ appveyor.yml = appveyor.yml
+ CHANGELOG.md = CHANGELOG.md
+ ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
+ README.md = README.md
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..bfc2080
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+image: Visual Studio 2015
+
+install:
+- ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
+
+before_build:
+ - ps: Vsix-IncrementVsixVersion | Vsix-UpdateBuildVersion
+ #- ps: Vsix-TokenReplacement src\Unicorn.VS\source.extension.cs 'Version = "([0-9\\.]+)"' 'Version = "{version}"'
+
+build_script:
+ - nuget restore -Verbosity quiet
+ - msbuild /p:configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
+
+after_test:
+ - ps: Vsix-PushArtifacts | Vsix-PublishToGallery
diff --git a/art/control_panel.png b/art/control_panel.png
new file mode 100644
index 0000000..c54c124
Binary files /dev/null and b/art/control_panel.png differ
diff --git a/art/new_connection.png b/art/new_connection.png
new file mode 100644
index 0000000..4f0b034
Binary files /dev/null and b/art/new_connection.png differ
diff --git a/art/new_connection_dialog.png b/art/new_connection_dialog.png
new file mode 100644
index 0000000..aaeae6d
Binary files /dev/null and b/art/new_connection_dialog.png differ
diff --git a/art/settings.png b/art/settings.png
new file mode 100644
index 0000000..47c2154
Binary files /dev/null and b/art/settings.png differ
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 9d7d6c8..0000000
--- a/license.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2015 Andrii Snihyr
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/Unicorn.VS/Properties/AssemblyInfo.cs b/src/Unicorn.VS/Properties/AssemblyInfo.cs
index 6534c10..bf52caf 100644
--- a/src/Unicorn.VS/Properties/AssemblyInfo.cs
+++ b/src/Unicorn.VS/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyTitle("Unicorn.VS")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Andrii Snigyr")]
+[assembly: AssemblyCompany("Andrii Snihyr")]
[assembly: AssemblyProduct("Unicorn.VS")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
diff --git a/src/Unicorn.VS/Unicorn.VS.csproj b/src/Unicorn.VS/Unicorn.VS.csproj
index c1a8263..136f1f2 100644
--- a/src/Unicorn.VS/Unicorn.VS.csproj
+++ b/src/Unicorn.VS/Unicorn.VS.csproj
@@ -21,8 +21,9 @@
Properties
Unicorn.VS
Unicorn.VS
- True
- Key.snk
+ false
+
+
v4.5
@@ -221,9 +222,6 @@
Designer
-
-
-
Menus.ctmenu
diff --git a/src/Unicorn.VS/source.extension.vsixmanifest b/src/Unicorn.VS/source.extension.vsixmanifest
index 8e6e2b6..01c08ca 100644
--- a/src/Unicorn.VS/source.extension.vsixmanifest
+++ b/src/Unicorn.VS/source.extension.vsixmanifest
@@ -5,7 +5,7 @@
Unicorn Control Panel
Unicorn control panel for Visual Studio
https://github.com/BerserkerDotNet/Unicorn.VisualStudio
- license.txt
+ license
https://github.com/BerserkerDotNet/Unicorn.VisualStudio/wiki
releasenotes.txt
Resources\Package.ico