Merge branch 'master' into 3.6-beta

.gitignore

@@ -103,3 +103,4 @@ spine-ue4/Plugins/SpinePlugin/Binaries
 spine-ue4/SpineUE4.VC.opendb
 spine-ue4/SpineUE4.VC.db
 spine-ue4/SpineUE4.sln
+spine-ue4/SpineUE4.VC.db

spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/SpineEditorPlugin.Build.cs

@@ -6,9 +6,9 @@ namespace UnrealBuildTool.Rules
 	{
 		public SpineEditorPlugin(TargetInfo Target)
 		{
-			PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public" });
+			PublicIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Public", "SpinePlugin/Public/spine-c/include" });
             
-            PrivateIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Private" });
+            PrivateIncludePaths.AddRange(new string[] { "SpineEditorPlugin/Private", "SpinePlugin/Public/spine-c/include" });
             
             PublicDependencyModuleNames.AddRange(new string[] {
                 "Core",