diff --git a/README.md b/README.md
index 623b00f1..138143d2 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,16 @@ the time to spend coding.
 
 ### Code
 
-1. Fork the main repository
-2. Work on a feature in your own private branch
-3. Once you are finished with you work or want someone to you, open a pull
-   request
-4. Someone will review your code and merge it. Some fixes might be required on
+1. Fork the main repository on github.
+2. Check out the source code:
+   * Make sure [git lfs](https://git-lfs.github.com/) is installed **before**
+     cloning the repository or you'll need to delete and re-checkout some files.
+   * `git clone ...` your fork.
+   * `git submodule update --init` to grab MICore and MIDebugEngine.
+3. Work on a feature in your own private branch.
+4. Once you are finished with you work or want someone to you, open a pull
+   request.
+5. Someone will review your code and merge it. Some fixes might be required on
    your side.
 
 ## Prerequisites
diff --git a/VisualRust.sln b/VisualRust.sln
index 4eadda29..d43f8edf 100644
--- a/VisualRust.sln
+++ b/VisualRust.sln
@@ -62,536 +62,210 @@ Global
 		src\VisualRust\VisualRust.projitems*{e3265c09-2dd6-4ae5-a0fd-a0576fe9d279}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug.Lab|Any CPU = Debug.Lab|Any CPU
-		Debug.Lab|Mixed Platforms = Debug.Lab|Mixed Platforms
-		Debug.Lab|x64 = Debug.Lab|x64
-		Debug.Lab|x86 = Debug.Lab|x86
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release.Lab|Any CPU = Release.Lab|Any CPU
-		Release.Lab|Mixed Platforms = Release.Lab|Mixed Platforms
-		Release.Lab|x64 = Release.Lab|x64
-		Release.Lab|x86 = Release.Lab|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
+		Debug|All VS = Debug|All VS
+		Debug|VS2015 Only = Debug|VS2015 Only
+		Debug|VS2017 Only = Debug|VS2017 Only
+		Release|All VS = Release|All VS
+		Release|VS2015 Only = Release|VS2015 Only
+		Release|VS2017 Only = Release|VS2017 Only
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|x64.ActiveCfg = Release|Any CPU
-		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|x86.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|x64.ActiveCfg = Release|Any CPU
-		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|x64.ActiveCfg = Release|Any CPU
-		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|x86.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|x64.ActiveCfg = Release|Any CPU
-		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|x86.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|x64.ActiveCfg = Release|Any CPU
-		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|x86.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|x64.ActiveCfg = Release|Any CPU
-		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|x86.ActiveCfg = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|Any CPU.ActiveCfg = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|Any CPU.Build.0 = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|Mixed Platforms.Build.0 = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|x64.ActiveCfg = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|x64.Build.0 = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|x86.ActiveCfg = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug.Lab|x86.Build.0 = Debug.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|Any CPU.ActiveCfg = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|Any CPU.Build.0 = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|Mixed Platforms.ActiveCfg = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|Mixed Platforms.Build.0 = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|x64.ActiveCfg = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|x64.Build.0 = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|x86.ActiveCfg = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release.Lab|x86.Build.0 = Release.Lab|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|x64.ActiveCfg = Release|Any CPU
-		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|Any CPU.ActiveCfg = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|Any CPU.Build.0 = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|Mixed Platforms.Build.0 = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|x64.ActiveCfg = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|x64.Build.0 = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|x86.ActiveCfg = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug.Lab|x86.Build.0 = Debug.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|Any CPU.ActiveCfg = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|Any CPU.Build.0 = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|Mixed Platforms.ActiveCfg = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|Mixed Platforms.Build.0 = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|x64.ActiveCfg = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|x64.Build.0 = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|x86.ActiveCfg = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release.Lab|x86.Build.0 = Release.Lab|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|x64.ActiveCfg = Release|Any CPU
-		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|x86.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|x64.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|x86.Build.0 = Debug|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|x64.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|x64.Build.0 = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|x86.ActiveCfg = Release|Any CPU
-		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|x86.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|x64.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|x86.Build.0 = Debug|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|Any CPU.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|x64.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|x64.Build.0 = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|x86.ActiveCfg = Release|Any CPU
-		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|x86.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|x64.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|x86.Build.0 = Debug|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|x64.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|x64.Build.0 = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|x86.ActiveCfg = Release|Any CPU
-		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|x86.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|Any CPU.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|Any CPU.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|x64.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|x64.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|x86.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug.Lab|x86.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|x64.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|x86.Build.0 = Debug|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|Any CPU.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|Any CPU.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|Mixed Platforms.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|x64.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|x64.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|x86.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release.Lab|x86.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|x64.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|x64.Build.0 = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|x86.ActiveCfg = Release|Any CPU
-		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|x86.Build.0 = Release|Any CPU
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|x64.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug.Lab|x86.Build.0 = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|x64.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|x86.ActiveCfg = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|x86.Build.0 = Debug|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|x64.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|x64.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|x86.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release.Lab|x86.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|Any CPU.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|Mixed Platforms.Build.0 = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|x64.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|x86.ActiveCfg = Release|x86
-		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|x86.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|x64.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug.Lab|x86.Build.0 = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|x64.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|x86.ActiveCfg = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|x86.Build.0 = Debug|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|x64.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|x64.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|x86.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release.Lab|x86.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|Any CPU.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|Mixed Platforms.Build.0 = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|x64.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|x86.ActiveCfg = Release|x86
-		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|x86.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|x64.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug.Lab|x86.Build.0 = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|x64.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|x86.ActiveCfg = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|x86.Build.0 = Debug|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|x64.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|x64.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|x86.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release.Lab|x86.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|Any CPU.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|Mixed Platforms.Build.0 = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|x64.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|x86.ActiveCfg = Release|x86
-		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|x86.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|x64.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug.Lab|x86.Build.0 = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|x64.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|x86.ActiveCfg = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|x86.Build.0 = Debug|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|x64.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|x64.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|x86.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release.Lab|x86.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|Any CPU.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|Mixed Platforms.Build.0 = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|x64.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|x86.ActiveCfg = Release|x86
-		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|x86.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|x64.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug.Lab|x86.Build.0 = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|x64.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|x86.ActiveCfg = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|x86.Build.0 = Debug|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|x64.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|x64.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|x86.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release.Lab|x86.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|Any CPU.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|Mixed Platforms.Build.0 = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|x64.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|x86.ActiveCfg = Release|x86
-		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|x86.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|Any CPU.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|Any CPU.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|Mixed Platforms.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|Mixed Platforms.Build.0 = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|x64.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|x64.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|x86.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug.Lab|x86.Build.0 = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|x64.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|x86.ActiveCfg = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|x86.Build.0 = Debug|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|Any CPU.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|Any CPU.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|Mixed Platforms.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|Mixed Platforms.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|x64.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|x64.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|x86.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release.Lab|x86.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|Any CPU.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|Mixed Platforms.Build.0 = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|x64.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|x86.ActiveCfg = Release|x86
-		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|x86.Build.0 = Release|x86
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|All VS.Build.0 = Debug|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|All VS.ActiveCfg = Release|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|All VS.Build.0 = Release|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{8B7B30F7-17C1-4CE8-BAF4-88B086AF7B25}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|All VS.Build.0 = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|All VS.ActiveCfg = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|All VS.Build.0 = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{E983E989-F83A-4643-896A-AD496BF647D0}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|All VS.Build.0 = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|All VS.ActiveCfg = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|All VS.Build.0 = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{9CF556AB-76FE-4C3D-AD0A-B64B3B9989B4}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|All VS.Build.0 = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|All VS.ActiveCfg = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|All VS.Build.0 = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{59D94B96-1AF7-46F2-8790-AAB6DFAE8D9A}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|All VS.Build.0 = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|All VS.ActiveCfg = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|All VS.Build.0 = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{C68F80B6-62AC-44EB-8557-88761524B495}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|All VS.Build.0 = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|All VS.ActiveCfg = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|All VS.Build.0 = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{B99CC9EB-90F2-4040-9E66-418CC7042153}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|All VS.Build.0 = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|All VS.ActiveCfg = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|All VS.Build.0 = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|All VS.Build.0 = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|All VS.ActiveCfg = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|All VS.Build.0 = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{12CC862D-95B7-4224-8E16-B928C6333677}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|All VS.Build.0 = Debug|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|All VS.ActiveCfg = Release|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|All VS.Build.0 = Release|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{B8696D0C-8ADB-4C11-8CEE-5C81AA8C6EBD}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|All VS.Build.0 = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|VS2015 Only.Build.0 = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|All VS.ActiveCfg = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|All VS.Build.0 = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|VS2015 Only.Build.0 = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{403D6DE5-6C9E-4836-90CA-CB803A2D3599}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|All VS.Build.0 = Debug|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|All VS.ActiveCfg = Release|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|All VS.Build.0 = Release|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{CE4062FE-D6D2-43FA-AD8C-709F103F4722}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|All VS.ActiveCfg = Debug|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|All VS.Build.0 = Debug|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|VS2015 Only.ActiveCfg = Debug|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|VS2017 Only.ActiveCfg = Debug|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Debug|VS2017 Only.Build.0 = Debug|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|All VS.ActiveCfg = Release|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|All VS.Build.0 = Release|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|VS2015 Only.ActiveCfg = Release|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|VS2017 Only.ActiveCfg = Release|Any CPU
+		{3893F2BE-BE63-4C53-BF64-85A7CF455B60}.Release|VS2017 Only.Build.0 = Release|Any CPU
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|All VS.ActiveCfg = Debug|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|All VS.Build.0 = Debug|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|VS2015 Only.Build.0 = Debug|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|All VS.ActiveCfg = Release|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|All VS.Build.0 = Release|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|VS2015 Only.Build.0 = Release|x86
+		{758DE8C9-18BB-4965-979B-73EC73902323}.Release|VS2017 Only.ActiveCfg = Release|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|All VS.ActiveCfg = Debug|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|All VS.Build.0 = Debug|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Debug|VS2017 Only.Build.0 = Debug|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|All VS.ActiveCfg = Release|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|All VS.Build.0 = Release|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|VS2017 Only.ActiveCfg = Release|x86
+		{E6C06FDB-FE41-4068-99B5-6042C0C098F5}.Release|VS2017 Only.Build.0 = Release|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|All VS.ActiveCfg = Debug|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|All VS.Build.0 = Debug|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Debug|VS2017 Only.Build.0 = Debug|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|All VS.ActiveCfg = Release|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|All VS.Build.0 = Release|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|VS2017 Only.ActiveCfg = Release|x86
+		{AB1D7D4B-514B-4583-A1E2-D158C2105CE2}.Release|VS2017 Only.Build.0 = Release|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|All VS.ActiveCfg = Debug|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|All VS.Build.0 = Debug|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|VS2015 Only.Build.0 = Debug|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|All VS.ActiveCfg = Release|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|All VS.Build.0 = Release|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|VS2015 Only.Build.0 = Release|x86
+		{D2F12A27-BEE9-40F1-8781-B94131F8920A}.Release|VS2017 Only.ActiveCfg = Release|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|All VS.ActiveCfg = Debug|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|All VS.Build.0 = Debug|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Debug|VS2017 Only.Build.0 = Debug|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|All VS.ActiveCfg = Release|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|All VS.Build.0 = Release|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|VS2017 Only.ActiveCfg = Release|x86
+		{0E441DF2-6AC4-4A6E-A4B6-53D261FA707B}.Release|VS2017 Only.Build.0 = Release|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|All VS.ActiveCfg = Debug|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|All VS.Build.0 = Debug|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|VS2015 Only.ActiveCfg = Debug|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|VS2015 Only.Build.0 = Debug|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Debug|VS2017 Only.ActiveCfg = Debug|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|All VS.ActiveCfg = Release|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|All VS.Build.0 = Release|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|VS2015 Only.ActiveCfg = Release|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|VS2015 Only.Build.0 = Release|x86
+		{1708E461-3369-4941-A390-6E6CB2C1A057}.Release|VS2017 Only.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/appveyor.yml b/appveyor.yml
index dbc844f3..f024f7b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,10 @@ branches:
 skip_tags: true
 image: Visual Studio 2017
 configuration:
+- Debug
 - Release
+platform:
+- All VS
 install:
 - ps: >-
     Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-msvc.exe"
diff --git a/src/VisualRust.Build/CargoBuild.cs b/src/VisualRust.Build/CargoBuild.cs
index b4849cf3..d66657b2 100644
--- a/src/VisualRust.Build/CargoBuild.cs
+++ b/src/VisualRust.Build/CargoBuild.cs
@@ -78,7 +78,7 @@ protected override bool ExecuteCargo(Cargo cargo)
                     {
                         var reader = new JsonTextReader(new StringReader(e.Data));
                         var message = Cargo.JsonSerializer.Deserialize<CargoMessage>(reader);
-                        Rustc.LogRustcMessage(message.message, Manifest.Directory.FullName, Log);
+                        if (message != null) Rustc.LogRustcMessage(message.message, Manifest.Directory.FullName, Log);
                     }
                 };
 
diff --git a/src/VisualRust.Build/Rustc.cs b/src/VisualRust.Build/Rustc.cs
index b93ce2af..3ffe5989 100644
--- a/src/VisualRust.Build/Rustc.cs
+++ b/src/VisualRust.Build/Rustc.cs
@@ -369,6 +369,7 @@ private void LogRustcMessage(RustcMessageHuman msg)
 
         public static void LogRustcMessage(RustcMessageJson msg, string rootPath, TaskLoggingHelper log)
         {
+            if (msg == null) return;
             // todo multi span
             // todo all other fields
             // todo mb help key word is code.explanation
@@ -381,19 +382,35 @@ public static void LogRustcMessage(RustcMessageJson msg, string rootPath, TaskLo
             if (String.IsNullOrEmpty(code) && primarySpan == null && msg.message.Contains("aborting due to"))
                 return;
 
+            // primarySpan.file_name might not be legal (e.g. "file_name":"<println macros>" is common)
+            string logFile = null;
+            var logSpan = primarySpan;
+            while (logSpan != null)
+            {
+                try
+                {
+                    logFile = Path.Combine(rootPath, logSpan.file_name); // maybe checking for ".rs" extension is saner than trying this and seeing if it throws?
+                    break;
+                }
+                catch (ArgumentException) // "Illegal characters in path."
+                {
+                    logSpan = logSpan.expansion?.span; // see if expanding helps us find a real file
+                }
+            }
+
             if (type == RustcMessageType.Error)
             {
-                if (primarySpan == null)
+                if (logSpan == null)
                     log.LogError(msg.message);
                 else
-                    log.LogError(null, code, null, Path.Combine(rootPath, primarySpan.file_name), primarySpan.line_start, primarySpan.column_start, primarySpan.line_end, primarySpan.column_end, msg.message);
+                    log.LogError(null, code, null, logFile, logSpan.line_start, logSpan.column_start, logSpan.line_end, logSpan.column_end, msg.message);
             }
             else
             {
-                if (primarySpan == null)
+                if (logSpan == null)
                     log.LogWarning(msg.message);
                 else
-                    log.LogWarning(null, code, null, Path.Combine(rootPath, primarySpan.file_name), primarySpan.line_start, primarySpan.column_start, primarySpan.line_end, primarySpan.column_end, msg.message);
+                    log.LogWarning(null, code, null, logFile, logSpan.line_start, logSpan.column_start, logSpan.line_end, logSpan.column_end, msg.message);
             }
 
         }
diff --git a/src/VisualRust.Templates/VisualRust.Templates.csproj b/src/VisualRust.Templates/VisualRust.Templates.csproj
index c2a359dc..915844f4 100644
--- a/src/VisualRust.Templates/VisualRust.Templates.csproj
+++ b/src/VisualRust.Templates/VisualRust.Templates.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -102,10 +102,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/VisualRust.Templates/packages.config b/src/VisualRust.Templates/packages.config
index a17b5a18..6247245b 100644
--- a/src/VisualRust.Templates/packages.config
+++ b/src/VisualRust.Templates/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/src/VisualRust/Racer/RacerMatch.cs b/src/VisualRust/Racer/RacerMatch.cs
new file mode 100644
index 00000000..301cc8f6
--- /dev/null
+++ b/src/VisualRust/Racer/RacerMatch.cs
@@ -0,0 +1,322 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace VisualRust.Racer
+{
+    public struct RacerMatch
+    {
+        /// <summary>
+        /// The full text this match matches against.
+        /// <para>Example: "read_line"</para>
+        /// </summary>
+        public string MatchString;
+
+        /// <summary>
+        /// Snippets appear to be equivalent to the MatchString, only containing parameter name information.
+        /// May be null unless using a "With Snippet" racer completion.
+        /// 
+        /// <para>Example: "read_line(${1:buf})"</para>
+        /// </summary>
+        public string Snippet;
+
+        /// <summary>
+        /// The 1-based line number where this match was defined.
+        /// <para>Example: "280"</para>
+        /// </summary>
+        public string LineNum;
+
+        /// <summary>
+        /// The column where this match was defined.
+        /// <para>Example: "11"</para>
+        /// </summary>
+        public string CharNum;
+
+        /// <summary>
+        /// The file where this match was defined.
+        /// <para>Example: "C:\Users\User\.rustup\toolchains\stable-x86_64-pc-windows-msvc\lib\rustlib\src\rust\src\libstd\io\stdio.rs"</para>
+        /// </summary>
+        public string PathDisplay;
+
+        /// <summary>
+        /// What kind of thing is being matched against.
+        /// <para>Example: "Function"</para>
+        /// </summary>
+        public string MatchType;
+
+        /// <summary>
+        /// Seems to contain the signature of the match.
+        /// <para>Example: "pub fn read_line(&amp;self, buf: &amp;mut String) -> io::Result&lt;usize&gt;"</para>
+        /// </summary>
+        public string Context;
+
+        /// <summary>
+        /// Contains the documentation for the match.  Likely contains e.g. Markdown formatting - but the rust string has been unescaped.
+        /// May be null unless using a "With Snippet" racer completion.
+        /// 
+        /// <para>Example: "Locks this handle and reads a line of input into the specified buffer.\n\nFor detailed semantics of this method, ..."</para>
+        /// </summary>
+        public string Documentation;
+
+        static readonly Regex ReDocsCodeSection = new Regex(@"(?<=^|\n)```(?<type>[a-zA-Z_0-9]*)\n(?<code>.*?)\n```(?=\n|$)", RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Singleline);
+        static readonly Regex ReDocsCodeInline = new Regex(@"`(?<code>.*?)`", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+        static readonly Regex ReDocsSummaryLine = new Regex(@"^(?<docs>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+        static readonly Regex ReDocsSummaryParas = new Regex(@"(?<docs>((^|(\r?\n))(?!#)(.*))*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+
+        /// <summary>
+        /// Documentation with some ancillary markdown such as ```code sections``` and `inline identifiers` stripped, for use in plaintext intellisense displays.
+        /// Other formatting such as # Headers will remain in place.
+        /// </summary>
+        public string PlainDocumentation
+        {
+            get
+            {
+                var d = Documentation ?? "";
+                d = ReDocsCodeSection.Replace(d, codeSection => codeSection.Groups["code"].Value);
+                d = ReDocsCodeInline .Replace(d, codeInline  => codeInline .Groups["code"].Value);
+                return d;
+            }
+        }
+
+        public string PlainSummaryLine
+        {
+            get
+            {
+                var m = ReDocsSummaryLine.Match(PlainDocumentation);
+                return m.Success ? m.Groups["docs"].Value : "";
+            }
+        }
+
+        public string PlainSummaryParagraphs
+        {
+            get
+            {
+                var docs = PlainDocumentation;
+                var m = ReDocsSummaryParas.Match(PlainDocumentation);
+                return m.Success ? m.Groups["docs"].Value.TrimEnd() : "";
+            }
+        }
+
+
+
+        public enum Type
+        {
+            /// <summary>
+            /// Generated by "racer.exe complete"
+            /// </summary>
+            Complete,
+
+            /// <summary>
+            /// Generated by "racer.exe complete-with-snippet"
+            /// </summary>
+            CompleteWithSnippet
+        }
+
+        public enum Interface
+        {
+            /// <summary>
+            /// Generated by "racer.exe --interface text ..."
+            /// </summary>
+            Text,
+
+            /// <summary>
+            /// Generated by "racer.exe --interface tab-text ..."
+            /// </summary>
+            TabText,
+
+            /// <summary>
+            /// Generated by "racer.exe ..." with no explicit "--interface ..." flags
+            /// </summary>
+            Default=Text
+        }
+
+
+
+        /// <summary>
+        /// Try and parse a single "MATCH ..." line from "racer complete" or "racer complete-with-snippet"
+        /// </summary>
+        /// <param name="line">The "MATCH ..." text to try and parse.</param>
+        /// <param name="type">Was "complete" or "complete-with-snippet" invoked?</param>
+        /// <param name="interface_">Was "--interface [text|tab-text]" used?</param>
+        /// <param name="match">The resulting parsed output.</param>
+        /// <returns>True if the line was successfully parsed, false otherwise</returns>
+        public static bool TryParse(string line, Type type, Interface interface_, out RacerMatch match)
+        {
+            // Emitting code: https://github.com/racer-rust/racer/blob/4d694e1e17f58bbf01e52fc152065d4bc06157e2/src/bin/main.rs#L216-L254
+            match = new RacerMatch();
+
+            if (!line.StartsWith(interface_ == Interface.TabText ? "MATCH\t" : "MATCH ")) return false;
+
+            var seperator = interface_ == Interface.TabText ? '\t' : type == Type.CompleteWithSnippet ? ';' : ',';
+            var pos = 6; // always exactly after the initial "MATCH\t" or "MATCH " prefix
+
+            bool success = false;
+            switch (type) {
+            case Type.Complete:
+                success
+                    =  TryParseStringUntilSkip         (line, ref pos, seperator, out match.MatchString)
+                    // no "snippet" field
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.LineNum)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.CharNum)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.PathDisplay)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.MatchType)
+                    && TryParseStringUntilEnd          (line, ref pos,            out match.Context);
+                    // no "docs" field
+                break;
+
+            case Type.CompleteWithSnippet:
+                var escSepeator = interface_ == Interface.TabText ? 't' : ';';
+                success
+                    =  TryParseStringUntilSkip         (line, ref pos, seperator, out match.MatchString)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.Snippet)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.LineNum)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.CharNum)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.PathDisplay)
+                    && TryParseStringUntilSkip         (line, ref pos, seperator, out match.MatchType)
+                    && TryParseEscStringUntilSkip      (line, ref pos, escSepeator, seperator, out match.Context)
+                    && TryParseSpanDebugStringUntilSkip(line, ref pos, '\0',      out match.Documentation);
+                break;
+            }
+
+            return success;
+        }
+
+        private static bool TryParseStringUntilSkip(string line, ref int position, char seperator, out string span)
+        {
+            int end = line.IndexOf(seperator, position);
+            if (end == -1)
+            {
+                span = null;
+                return false;
+            }
+            else
+            {
+                span = line.Substring(position, end-position);
+                position = end+1; // skip seperator
+                return true;
+            }
+        }
+
+        private static bool TryParseStringUntilEnd(string line, ref int position, out string span)
+        {
+            span = line.Substring(position);
+            return true;
+        }
+
+        private static bool TryParseEscStringUntilSkip(string line, ref int position, char escSeperator, char seperator, out string span)
+        {
+            var sb = new StringBuilder();
+            int start = position;
+            while (position < line.Length)
+            {
+                char ch = line[position++];
+                if (ch == '\\')
+                {
+                    if (position >= line.Length)
+                    {
+                        span = null;
+                        return false; // out of buffer
+                    }
+                    var ch2 = line[position++];
+                    if (ch2 == escSeperator)
+                    {
+                        sb.Append(seperator);
+                    }
+                    else
+                    {
+                        sb.Append(ch);
+                        --position;
+                    }
+                }
+                else if (ch == seperator)
+                {
+                    span = sb.ToString();
+                    return true;
+                }
+                else
+                {
+                    sb.Append(ch);
+                }
+            }
+            span = null;
+            return false;
+        }
+
+        private static bool TryParseSpanDebugStringUntilSkip(string line, ref int position, char seperator, out string span)
+        {
+            // String syntax ref: https://doc.rust-lang.org/reference/tokens.html
+
+            var unescaped = new StringBuilder();
+
+            span = null; // Lots of failure cases
+            if (position >= line.Length) return false; // no more buffer left
+            if (line[position] != '"') return false; // string didn't start with a quote
+
+            int start = ++position; // skip quote
+            int end = -1;
+
+            while (end == -1)
+            {
+                if (position >= line.Length) return false; // string didn't end with a quote
+                char ch = line[position++];
+                switch (ch)
+                {
+                case '\\': // escape
+                    {
+                        if (position >= line.Length) return false;
+                        char ch2 = line[position++];
+
+                        switch (ch2)
+                        {
+                        case 'u':
+                        case 'U':
+                            {
+                                // Skip up to 6 hex digits
+                                int n;
+                                for (n=0; n<6 && position < line.Length; ++n, ++position)
+                                {
+                                    char ch3 = line[position];
+                                    var isHex = ('0' <= ch3 && ch3 <= '9')
+                                        || ('a' <= ch3 && ch3 <= 'f')
+                                        || ('A' <= ch3 && ch3 <= 'F');
+                                    if (!isHex) break;
+                                }
+                                var value = Convert.ToInt32(line.Substring(position-n,n), 16);
+                                unescaped.Append(char.ConvertFromUtf32(value));
+                            }
+                            break;
+                        case 'x':
+                            {
+                                if (position+2 > line.Length) return false;
+                                var value = Convert.ToInt32(line.Substring(position,2), 16);
+                                unescaped.Append((char)value);
+                                position += 2; // Skip "\x??"
+                            }
+                            break;
+                        case '\\': unescaped.Append('\\'); break;
+                        case 'n':  unescaped.Append('\n'); break;
+                        case 'r':  unescaped.Append('\r'); break;
+                        case ';':  unescaped.Append(';');  break; // Rust doesn't normally escape this, but racer sometimes does
+                        case 't':  unescaped.Append('\t'); break;
+                        case '"':  unescaped.Append('\"'); break;
+                        case '\'': unescaped.Append('\''); break;
+                        case '0':  unescaped.Append('\0'); break;
+                        }
+                    }
+                    break;
+                case '"': // terminating quote
+                    end = position-1; // don't include quote
+                    break;
+                default:
+                    unescaped.Append(ch);
+                    break;
+                }
+            }
+
+            if (seperator != '\0' && (position >= line.Length || line[position++] != seperator)) return false; // expected to skip a final seperator
+            span = unescaped.ToString();
+            return true;
+        }
+    }
+}
diff --git a/src/VisualRust/RustCompletionCommandHandler.cs b/src/VisualRust/RustCompletionCommandHandler.cs
index 423b1e36..71688dd1 100644
--- a/src/VisualRust/RustCompletionCommandHandler.cs
+++ b/src/VisualRust/RustCompletionCommandHandler.cs
@@ -14,6 +14,7 @@
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
 using VSCommand = Microsoft.VisualStudio.VSConstants.VSStd2KCmdID;
+using System.Diagnostics;
 
 namespace VisualRust
 {
@@ -73,27 +74,60 @@ protected override bool Execute(VSCommand command, uint options, IntPtr pvaIn, I
                 {
                     case VSConstants.VSStd2KCmdID.TYPECHAR:
                         char ch = GetTypeChar(pvaIn);
-                        var tokensAtCursor = Utils.GetTokensAtPosition(TextView.Caret.Position.BufferPosition);
-
-                        RustTokenTypes? leftTokenType = tokensAtCursor.Item1 != null ? (RustTokenTypes?)Utils.LexerTokenToRustToken(tokensAtCursor.Item1.Text, tokensAtCursor.Item1.Type) : null;
-                        RustTokenTypes? currentTokenType = tokensAtCursor.Item2 != null ? (RustTokenTypes?)Utils.LexerTokenToRustToken(tokensAtCursor.Item2.Text, tokensAtCursor.Item2.Type) : null;
+                        var tokens      = Utils.GetLineTokensUpTo(TextView.Caret.Position.BufferPosition);
+                        var tokenTypes  = tokens.Select(token => Utils.LexerTokenToRustToken(token.Text, token.Type)).ToList();
+                        int tokensCount = tokenTypes.Count;
+                        RustTokenTypes? currentTokenType  = tokensCount >= 1 ? (RustTokenTypes?)tokenTypes[tokensCount-1] : null; // the token we just helped type
+                        Trace("TYPECHAR: ch={0}, currentToken={1}", ch, currentTokenType);
 
                         RustTokenTypes[] cancelTokens = { RustTokenTypes.COMMENT, RustTokenTypes.STRING, RustTokenTypes.DOC_COMMENT, RustTokenTypes.WHITESPACE };
-
-                        if (char.IsControl(ch)
-                            || ch == ';'
-                            || (leftTokenType.HasValue && cancelTokens.Contains(leftTokenType.Value))
-                            || (currentTokenType.HasValue && cancelTokens.Contains(currentTokenType.Value)))
+                        if (char.IsControl(ch) || (currentTokenType.HasValue && cancelTokens.Contains(currentTokenType.Value)))
                         {
                             Cancel();
                         }
-                        else if (leftTokenType == RustTokenTypes.STRUCTURAL)
+                        else if (currentTokenType == RustTokenTypes.STRUCTURAL)
                         {
-                            Cancel();
-                            StartSession();
+                            var subtype = tokens.Last().Type;
+                            if (subtype == RustLexer.RustLexer.DOT || subtype == RustLexer.RustLexer.MOD_SEP)
+                            {
+                                RestartSession();
+                            }
+                            else
+                            {
+                                Cancel();
+                            }
                         }
-                        else if (leftTokenType == RustTokenTypes.IDENT && currentTokenType == null)
+                        else if (currentTokenType == RustTokenTypes.IDENT)
                         {
+                            Func<string, bool> isPreceededBy = (prefixStr) =>
+                            {
+                                var prefix = prefixStr.Split(' ');
+                                if (tokensCount-1 < 2*prefix.Length)
+                                    return false; // not enough tokens to be preceeded by all that
+                                for (int i=0; i<prefix.Length; ++i)
+                                {
+                                    if (tokens[tokensCount - 2*prefix.Length + 2*i - 1].Text != prefix[i]) return false; // mismatch
+                                    if (tokens[tokensCount - 2*prefix.Length + 2*i - 0].Type != RustLexer.RustLexer.WHITESPACE) return false; // TODO: Allow e.g. mixture of comments/whitespace
+                                }
+                                return true;
+                            };
+
+                            // Don't start a session when naming new things...
+                            if (isPreceededBy("fn")) break;
+                            // Note that "if let" and "while let" can do pattern matching which could benifit from intellisense
+                            if (isPreceededBy("let") && !isPreceededBy("if let") && !isPreceededBy("while let")) break;
+                            if (isPreceededBy("let mut") && !isPreceededBy("if let mut") && !isPreceededBy("while let mut")) break;
+                            if (isPreceededBy("const") || isPreceededBy("static") || isPreceededBy("static mut")) break; // shouldn't cull 'static lifetimes, only static vars
+                            if (isPreceededBy("struct")) break;
+                            if (isPreceededBy("trait")) break;
+                            if (isPreceededBy("enum")) break;
+                            if (isPreceededBy("type")) break;
+
+                            // Things we still allow to complete:
+                            // closure var names - need a full AST to properly disambugate those from identifiers after binary |s
+                            // impl s - these reference existing types, so this is by design
+                            // mod s - not always new modules, so this is also by design?
+
                             StartSession();
                         }
                         else if (IsSessionStarted)
@@ -119,6 +153,7 @@ protected override bool Execute(VSCommand command, uint options, IntPtr pvaIn, I
 
         private void RestartSession()
         {
+            Trace("RestartSession()");
             if (IsSessionStarted)
             {
                 currentSession.Dismiss();
@@ -128,6 +163,7 @@ private void RestartSession()
 
         private void Filter()
         {
+            Trace("Filter()");
             if (!IsSessionStarted)
                 return;
 
@@ -140,6 +176,7 @@ private void Filter()
 
         private bool Cancel()
         {
+            Trace("Cancel()");
             if (currentSession == null)
                 return false;
 
@@ -150,6 +187,7 @@ private bool Cancel()
 
         private bool Complete(bool force)
         {
+            Trace("Complete(force={0})", force);
             if (currentSession == null)
                 return false;
 
@@ -167,6 +205,7 @@ private bool Complete(bool force)
 
         private bool StartSession()
         {
+            Trace("StartSession()");
             if (currentSession != null)
             {
                 Filter();
@@ -227,5 +266,17 @@ protected override uint ConvertFromCommand(VSCommand command)
         {
             return (uint)command;
         }
+
+        [Conditional("DISABLED")]
+        private void Trace(string message, params object[] args)
+        {
+            SnapshotPoint caret = TextView.Caret.Position.BufferPosition;
+            ITextSnapshotLine line = caret.GetContainingLine();
+
+            var fmtMsg = string.Format(message, args);
+            var fmtSess = currentSession == null ? "null" : currentSession.IsDismissed ? "dismissed" : currentSession.IsStarted ? "started" : "...ready?";
+            var fmtText = line.GetText().Replace('\t',' ').Insert(caret.Position-line.Start, "@");
+            Utils.DebugPrintToOutput("RustCompletionCommandHandler: {0} session={1} text=[{2}]", fmtMsg.PadRight(25, ' '), fmtSess.PadRight("dismissed".Length, ' '), fmtText);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/VisualRust/RustCompletionSource.cs b/src/VisualRust/RustCompletionSource.cs
index e5948497..ddf9b0c7 100644
--- a/src/VisualRust/RustCompletionSource.cs
+++ b/src/VisualRust/RustCompletionSource.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.IO;
 using System.Linq;
 using System.Windows.Media;
 using Antlr4.Runtime;
@@ -8,6 +9,9 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
+using System.Text.RegularExpressions;
+using System.Windows;
+using VisualRust.Racer;
 
 namespace VisualRust
 {
@@ -169,6 +173,7 @@ public void AugmentCompletionSession(ICompletionSession session, IList<Completio
             completions.AddRange(GetKeywordCompletions(prefix));
 
             completionSets.Add(new RustCompletionSet("All", "All", span, completions, null));
+
         }
 
         private static IToken GetActiveToken(int columnIndex, ITextSnapshotLine line)
@@ -229,10 +234,13 @@ private static string RunRacer(ITextSnapshot snapshot, SnapshotPoint point)
         {
             using (var tmpFile = new TemporaryFile(snapshot.GetText()))
             {
-                // Build racer command line: "racer.exe complete lineNo columnNo rustfile
+                // Build racer command line: "racer.exe complete lineNo columnNo \"originalFile\" \"substituteFile\"
+                ITextDocument document = null;
+                snapshot?.TextBuffer?.Properties?.TryGetProperty(typeof(ITextDocument), out document);
+                var origPath = document?.FilePath ?? tmpFile.Path;
                 int lineNumber = point.GetContainingLine().LineNumber;
                 int charNumber = GetColumn(point);
-                string args = string.Format("complete {0} {1} {2}", lineNumber + 1, charNumber, tmpFile.Path);
+                string args = string.Format("complete-with-snippet {0} {1} \"{2}\" \"{3}\"", lineNumber + 1, charNumber, origPath, tmpFile.Path);
                 return Racer.RacerSingleton.Run(args);
             }
         }
@@ -249,28 +257,32 @@ private IEnumerable<Completion> GetCompletions(string racerResponse, out string
         }
 
         private IEnumerable<Completion> GetCompletions(string[] lines)
-        {            
+        {
             var matches = lines.Where(l => l.StartsWith("MATCH")).Distinct(StringComparer.Ordinal);
 
             foreach (var matchLine in matches)
             {
-                var tokens = matchLine.Substring(6).Split(',');
-                var text = tokens[0];
-                var langElemText = tokens[4];
-                var descriptionStartIndex = tokens[0].Length + tokens[1].Length + tokens[2].Length + tokens[3].Length + tokens[4].Length + 11;
-                var description = matchLine.Substring(descriptionStartIndex);
-                CompletableLanguageElement elType;
+                RacerMatch racerMatch;
+                if (!RacerMatch.TryParse(matchLine, RacerMatch.Type.CompleteWithSnippet, RacerMatch.Interface.Default, out racerMatch))
+                {
+                    Utils.DebugPrintToOutput("Failed to parse racer match line found in racer autocomplete resource: {0}", matchLine);
+                    continue;
+                }
 
-                if (!Enum.TryParse(langElemText, out elType))
+                CompletableLanguageElement elType;
+                if (!Enum.TryParse(racerMatch.MatchType, out elType))
                 {
-                    Utils.DebugPrintToOutput("Failed to parse language element found in racer autocomplete response: {0}", langElemText);
+                    Utils.DebugPrintToOutput("Failed to parse language element found in racer autocomplete response: {0}", racerMatch.MatchType);
                     continue;
                 }
 
-                var insertionText = text;
+                var displayText = racerMatch.MatchString;
+                var insertionText = racerMatch.MatchString;
+                var docs = racerMatch.PlainSummaryParagraphs;
+                //var docs = racerMatch.PlainSummaryLine;
+                var description = string.IsNullOrWhiteSpace(docs) ? racerMatch.Context : racerMatch.Context+"\n"+docs;
                 var icon = GetCompletionIcon(elType);
-
-                yield return new Completion(text, insertionText, description, icon, "");
+                yield return new Completion(displayText, insertionText, description, icon, "");
             }
         }
 
diff --git a/src/VisualRust/RustF1HelpCommandHandler.cs b/src/VisualRust/RustF1HelpCommandHandler.cs
index 44b2dbe4..6bdbf518 100644
--- a/src/VisualRust/RustF1HelpCommandHandler.cs
+++ b/src/VisualRust/RustF1HelpCommandHandler.cs
@@ -27,11 +27,15 @@ protected override bool Execute(VSConstants.VSStd97CmdID command, uint options,
             //       especially for IDENTs we probably want the whole path.
             //       Ideally we would even use the path after resolution (incorporating imported modules, etc)
             var snapshot = Buffer.CurrentSnapshot;
-            var tokens = Utils.GetTokensAtPosition(TextView.Caret.Position.BufferPosition);
+            var tokens = Utils.GetTokensAt(TextView.Caret.Position.BufferPosition);
             var leftToken = tokens.Item1;
-            var currentToken = tokens.Item2;
+            var rightToken = tokens.Item2;
 
-            var searchToken = currentToken ?? leftToken;
+            return TryHelpToken(leftToken) || TryHelpToken(rightToken);
+        }
+
+        private bool TryHelpToken(IToken searchToken)
+        {
             if (searchToken == null)
             {
                 // TODO: By returning false we fall back to the default MSDN page if we don't have a valid token/context.
@@ -41,7 +45,7 @@ protected override bool Execute(VSConstants.VSStd97CmdID command, uint options,
 
             var type = Utils.LexerTokenToRustToken(searchToken.Text, searchToken.Type);
             var text = searchToken.Text;
-            String helpUrl;
+            string helpUrl;
 
             // TODO: This "translation" should be done by a web service, as is the case with MSDN,
             //       in order to decouple this plugin from the structure of the Rust documentation.
@@ -49,6 +53,8 @@ protected override bool Execute(VSConstants.VSStd97CmdID command, uint options,
             switch (type)
             {
                 case RustTokenTypes.IDENT:
+                case RustTokenTypes.TYPE:
+                case RustTokenTypes.PRIMITIVE_TYPE:
                     helpUrl = "https://doc.rust-lang.org/std/?search=" + text;
                     break;
                 case RustTokenTypes.LIFETIME:
diff --git a/src/VisualRust/RustGoToDefinitionCommandHandler.cs b/src/VisualRust/RustGoToDefinitionCommandHandler.cs
index c47ea075..32d45c39 100644
--- a/src/VisualRust/RustGoToDefinitionCommandHandler.cs
+++ b/src/VisualRust/RustGoToDefinitionCommandHandler.cs
@@ -46,27 +46,17 @@ protected override bool Execute(VSConstants.VSStd97CmdID command, uint options,
         {
             var snapshot = Buffer.CurrentSnapshot;
             var snapshotPoint = TextView.Caret.Position.BufferPosition;
-            var tokens = Utils.GetTokensAtPosition(snapshotPoint);
 
-            // TODO: Taken from Execute in RustF1HelpCommandHandler
-            var leftToken = tokens.Item1;
-            var currentToken = tokens.Item2;
-            var findToken = currentToken ?? leftToken;
-            if (findToken == null)
-            {
-                return false;
-            }
-            
             var dte = (EnvDTE.DTE)ServiceProvider.GetService(typeof(EnvDTE.DTE));
             string filepath = dte.ActiveDocument.FullName;
 
-            using (var tmpFile = new TemporaryFile(snapshot.GetText(), System.IO.Path.GetDirectoryName(filepath)))
+            using (var tmpFile = new TemporaryFile(snapshot.GetText()))
             {
                 var line = snapshotPoint.GetContainingLine();
                 // line.LineNumber uses 0 based indexing
                 int row = line.LineNumber + 1;
                 int column = snapshotPoint.Position - line.Start.Position;
-                var args = String.Format("find-definition {0} {1} \"{2}\"", row, column, tmpFile.Path);
+                var args = String.Format("find-definition {0} {1} \"{2}\" \"{3}\"", row, column, filepath, tmpFile.Path);
                 var findOutput = Racer.RacerSingleton.Run(args);
                 if (Regex.IsMatch(findOutput, "^MATCH"))
                 {
diff --git a/src/VisualRust/Text/RustClassifierProvider.cs b/src/VisualRust/Text/RustClassifierProvider.cs
index 0ca463f0..bf282fb8 100644
--- a/src/VisualRust/Text/RustClassifierProvider.cs
+++ b/src/VisualRust/Text/RustClassifierProvider.cs
@@ -30,13 +30,7 @@ public sealed class RustClassifierProvider : ITaggerProvider
         internal IStandardClassificationService StandardClassificationService = null;
 
         [Import]
-        readonly IRustLexer lexer;
-
-        [ImportingConstructor]
-        public RustClassifierProvider(IRustLexer lexer)
-        {
-            this.lexer = lexer;
-        }
+        internal IRustLexer lexer = null;
 
         public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
         {
diff --git a/src/VisualRust/Utils.cs b/src/VisualRust/Utils.cs
index c6e46bde..4e0dbc24 100644
--- a/src/VisualRust/Utils.cs
+++ b/src/VisualRust/Utils.cs
@@ -262,7 +262,32 @@ internal static void PrintToOutput(string s, params object[] args)
             pane.Activate();
         }
 
-        internal static Tuple<IToken, IToken> GetTokensAtPosition(SnapshotPoint snapshotPoint)
+        /// <summary>
+        /// This will return the tokens before the cursor, including any the cursor is in the middle of.
+        /// Given a cursor at '|' in the following strings...
+        /// 
+        /// <para>"let |foo = 42;"  will result in ["let", " "].</para>
+        /// <para>"let f|oo = 42;"  will result in ["let", " ", "foo"].</para>
+        /// <para>"let foo| = 42;"  will result in ["let", " ", "foo"].</para>
+        /// <para>"let foo |= 42;"  will result in ["let", " ", "foo", " "].</para>
+        /// </summary>
+        internal static IList<IToken> GetLineTokensUpTo(SnapshotPoint snapshotPoint)
+        {
+            var line = snapshotPoint.GetContainingLine();
+            int col = snapshotPoint.Position - line.Start.Position;
+            var tokens = Utils.LexString(line.GetText()).TakeWhile(token => token.StartIndex < col).ToList();
+            return tokens;
+        }
+
+        /// <summary>
+        /// This will return the tokens immediately adjacent to the cursor (often the same token for both left and right).
+        /// Given a cursor at '|' in the following strings...
+        /// 
+        /// <para>" |ident" will result in (" ","ident").</para>
+        /// <para>"id|ent"  will result in ("ident","ident").</para>
+        /// <para>"ident| " will result in ("ident"," ").</para>
+        /// </summary>
+        internal static Tuple<IToken, IToken> GetTokensAt(SnapshotPoint snapshotPoint)
         {
             var line = snapshotPoint.GetContainingLine();
             var tokens = Utils.LexString(line.GetText()).ToList();
@@ -272,22 +297,11 @@ internal static Tuple<IToken, IToken> GetTokensAtPosition(SnapshotPoint snapshot
 
             int col = snapshotPoint.Position - line.Start.Position;
 
-            IToken leftToken;
-            IToken currentToken = tokens.FirstOrDefault(t => col > t.StartIndex && col <= t.StopIndex);
-
-            if (currentToken != null)
-            {
-                if (currentToken == tokens.First())
-                    leftToken = null;
-                else
-                    leftToken = tokens[tokens.IndexOf(currentToken) - 1];
-            }
-            else
-            {
-                leftToken = tokens.Last();
-            }
+            // Note: These are often the same token when e.g. the cursor is in the middle of an ident token.
+            IToken leftToken  = tokens.FirstOrDefault(t => col >= t.StartIndex && col <= t.StopIndex+1);
+            IToken rightToken = tokens.LastOrDefault (t => col >= t.StartIndex && col <= t.StopIndex+1);
 
-            return Tuple.Create(leftToken, currentToken);
+            return Tuple.Create(leftToken, rightToken);
         }
     }
 
diff --git a/src/VisualRust/VisualRust.2015.csproj b/src/VisualRust/VisualRust.2015.csproj
index b899aa04..731010f3 100644
--- a/src/VisualRust/VisualRust.2015.csproj
+++ b/src/VisualRust/VisualRust.2015.csproj
@@ -31,7 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension>true</DeployExtension>
-    <CreateVsixContainer>false</CreateVsixContainer>
+    <CreateVsixContainer>True</CreateVsixContainer>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/src/VisualRust/VisualRust.2017.csproj b/src/VisualRust/VisualRust.2017.csproj
index 1402da56..3fe6db6f 100644
--- a/src/VisualRust/VisualRust.2017.csproj
+++ b/src/VisualRust/VisualRust.2017.csproj
@@ -31,7 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension>true</DeployExtension>
-    <CreateVsixContainer>false</CreateVsixContainer>
+    <CreateVsixContainer>true</CreateVsixContainer>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/src/VisualRust/VisualRust.projitems b/src/VisualRust/VisualRust.projitems
index 8751b0d1..f09e50c2 100644
--- a/src/VisualRust/VisualRust.projitems
+++ b/src/VisualRust/VisualRust.projitems
@@ -8,16 +8,16 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>VisualRust</Import_RootNamespace>
   </PropertyGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <Content Include="$(MSBuildThisFileDirectory)..\VisualRust.Templates\bin\$(Configuration)\ProjectTemplates\Rust\127\ApplicationProject.zip">
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\bin\VisualRust.Templates\$(Configuration)\ProjectTemplates\Rust\127\ApplicationProject.zip">
       <Link>ProjectTemplates\ApplicationProject.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\VisualRust.Templates\bin\$(Configuration)\ProjectTemplates\Rust\127\LibraryProject.zip">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\bin\VisualRust.Templates\$(Configuration)\ProjectTemplates\Rust\127\LibraryProject.zip">
       <Link>ProjectTemplates\LibraryProject.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\VisualRust.Templates\bin\$(Configuration)\ItemTemplates\Rust\127\Module.zip">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\bin\VisualRust.Templates\$(Configuration)\ItemTemplates\Rust\127\Module.zip">
       <Link>ItemTemplates\Module.zip</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -55,6 +55,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ProjectProperties.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ProjectSystem\ProjectTreeModifiers.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ProvideDebugEngineAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Racer\RacerMatch.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Racer\RacerSingleton.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)GlobalSuppressions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Resources.Designer.cs">
diff --git a/src/VisualRust/source.extension.release.2015.vsixmanifest b/src/VisualRust/source.extension.release.2015.vsixmanifest
index 20e8b4ab..a708733b 100644
--- a/src/VisualRust/source.extension.release.2015.vsixmanifest
+++ b/src/VisualRust/source.extension.release.2015.vsixmanifest
@@ -4,7 +4,7 @@
     <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.2.0" Language="en-US" Publisher="The Piston Project" />
     <DisplayName>Visual Rust</DisplayName>
     <Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
-    <License>..\..\LICENSE.txt</License>
+    <License>LICENSE.txt</License>
   </Metadata>
   <Installation InstalledByMsi="false">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0, ]" />
@@ -17,6 +17,8 @@
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
+    <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[14.0, )" DisplayName="Visual Studio core editor" />
diff --git a/src/VisualRust/source.extension.release.2017.vsixmanifest b/src/VisualRust/source.extension.release.2017.vsixmanifest
index f7946672..7df39c67 100644
--- a/src/VisualRust/source.extension.release.2017.vsixmanifest
+++ b/src/VisualRust/source.extension.release.2017.vsixmanifest
@@ -4,7 +4,7 @@
     <Identity Id="40c1d2b5-528b-4966-a7b1-1974e3568abe" Version="0.2.0" Language="en-US" Publisher="The Piston Project" />
     <DisplayName>Visual Rust</DisplayName>
     <Description>Visual Studio integration for the Rust programming language (http://www.rust-lang.org/)</Description>
-    <License>..\..\LICENSE.txt</License>
+    <License>LICENSE.txt</License>
   </Metadata>
   <Installation InstalledByMsi="false">
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0, ]" />
@@ -17,6 +17,8 @@
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
+    <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0, )" DisplayName="Visual Studio core editor" />