Merge branch 'master' into newresolver

Conflicts:
	main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/CSharpModifierToken.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IdentifierExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/MemberReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Constraint.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/DelegateDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Identifier.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/MemberType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/SimpleType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/ForeachStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/GotoStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/TryCatchStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/FixedVariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/MemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/VariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/TypeSystemConvertVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/report.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/GenerateSwitchLabels.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/RemoveBackingStore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAttribute.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/ConstantValues.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Analysis/MinimalResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/NamedArgumentExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/TypeReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Formatter/ITextEditorAdapter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/IOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.jay
	main/contrib/ICSharpCode.NRefactory/CSharp/Refactoring/TypeSystemAstBuilder.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AliasNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AmbiguousResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ByReferenceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ConstantResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/Conversions.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ErrorResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/IResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ITypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/LocalResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MapTypeIntoNewContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberLookup.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MethodGroupResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NamespaceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/SimpleTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/TypeResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/IDStringProvider.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/XmlDocumentationProvider.cs
	main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
	main/contrib/ICSharpCode.NRefactory/Makefile.am
	main/contrib/ICSharpCode.NRefactory/PatternMatching/IPatternAstVisitor.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ArrayType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ByReferenceType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/DomRegion.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Error.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IAnnotatable.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ITypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompositeTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompoundTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeParameter.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/ProxyTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/TypeStorage.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ParameterizedType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/PointerType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/SharedTypes.cs
	main/contrib/ICSharpCode.NRefactory/Utils/DotNet35Compat.cs
	main/contrib/ICSharpCode.NRefactory/Utils/EmptyList.cs
	main/contrib/ICSharpCode.NRefactory/Utils/Platform.cs
	main/src/addins/CSharpBinding/CSharpBinding.csproj
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.ContextAction/MDRefactoringContext.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CreateMethod/CreateMethodCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs
	main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.csproj
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectTypeInfo.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/Document.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/CodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DatabaseProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
	main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AboutMonoDevelopTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/VersionInformationTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/AmbienceService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/CodeGenerator.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputFlags.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputSettings.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/ParsedDocument.cs
	main/tests/UnitTests/MonoDevelop.CSharpBinding/TopLevelTests.cs

1 files changed, 44 insertions, 15 deletions

diff --git a/main/Main.sln b/main/Main.sln
index 104f79618b..16e64876f1 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -40,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libstetic", "src\addins\Mon
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsteticui", "src\addins\MonoDevelop.GtkCore\libsteticui\libsteticui.csproj", "{7926DB5B-96A7-47A7-9870-DB42FA5C3548}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WelcomePage", "src\addins\WelcomePage\WelcomePage.csproj", "{E68526B5-A464-461B-A58D-23F0EB28E7D2}"

-EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "prj2make-sharp-lib", "src\addins\prj2make-sharp-lib\prj2make-sharp-lib.csproj", "{0F57E572-2359-4BAF-B302-6478C2E42FA2}"

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBNetBinding", "VBNetBinding", "{481E1487-E0F1-4C6D-BD71-E572D9A19683}"

@@ -186,6 +184,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdtool", "src\tools\mdtool\
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdmonitor", "src\tools\mdmonitor\mdmonitor.csproj", "{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CrashLog", "src\tools\mdcrashlog\MonoDevelop.CrashLog.csproj", "{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacCrashLogger", "src\tools\MacCrashLogger\MacCrashLogger.csproj", "{E414CD46-33C8-4CE1-986F-B601F941EBB9}"

+EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}"

 	ProjectSection(MonoDevelopProperties) = preProject

 		BaseDirectory = tests

@@ -199,6 +201,8 @@ Global
 		Release|Any CPU = Release|Any CPU

 		DebugWin32|x86 = DebugWin32|x86

 		DebugMac|Any CPU = DebugMac|Any CPU

+		Debug|x86 = Debug|x86

+		Release|x86 = Release|x86

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -234,12 +238,16 @@ Global
 		{0AF16AF1-0876-413E-9803-08BD33C19E00}.Release|Any CPU.Build.0 = Release|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|x86.Build.0 = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|Any CPU.Build.0 = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|x86.ActiveCfg = Release|Any CPU

+		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Release|x86.Build.0 = Release|Any CPU

 		{0F57E572-2359-4BAF-B302-6478C2E42FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0F57E572-2359-4BAF-B302-6478C2E42FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{0F57E572-2359-4BAF-B302-6478C2E42FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -361,7 +369,6 @@ Global
 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

-		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Release|Any CPU.Build.0 = Release|Any CPU

 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -461,7 +468,6 @@ Global
 		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

-		{7B57882B-AD46-469B-84E7-06DF98D11468}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{7B57882B-AD46-469B-84E7-06DF98D11468}.Release|Any CPU.Build.0 = Release|Any CPU

 		{7D1252E7-42D0-486D-B04B-CFFDD6113691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -561,7 +567,6 @@ Global
 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

-		{9A415695-CF80-4845-AA80-0DA26CF1E256}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{9A415695-CF80-4845-AA80-0DA26CF1E256}.Release|Any CPU.Build.0 = Release|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -613,8 +618,10 @@ Global
 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.Build.0 = Release|Any CPU

 		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

+		{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{AC7D119C-980B-4712-8811-5368C14412D7}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{ADDC9D20-83C5-4245-9B46-2C5F6642CFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -693,6 +700,18 @@ Global
 		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{D1D35409-C814-47F6-B038-B9B5BF0FE490}.Release|Any CPU.Build.0 = Release|Any CPU

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|Any CPU.ActiveCfg = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|Any CPU.Build.0 = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|x86.ActiveCfg = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|x86.Build.0 = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugMac|Any CPU.ActiveCfg = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugMac|Any CPU.Build.0 = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugWin32|x86.ActiveCfg = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugWin32|x86.Build.0 = Debug|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|Any CPU.ActiveCfg = Release|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|Any CPU.Build.0 = Release|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|x86.ActiveCfg = Release|x86

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|x86.Build.0 = Release|x86

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -714,7 +733,6 @@ Global
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU

 		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -725,14 +743,16 @@ Global
 		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.Build.0 = Release|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugWin32|x86.Build.0 = Debug|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Debug|x86.Build.0 = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|x86.ActiveCfg = Release|Any CPU

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|x86.Build.0 = Release|Any CPU

 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -781,6 +801,14 @@ Global
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|x86.Build.0 = Debug|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.Build.0 = Release|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugWin32|x86.ActiveCfg = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.DebugWin32|x86.Build.0 = Debug|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{E68526B5-A464-461B-A58D-23F0EB28E7D2}.Release|Any CPU.Build.0 = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(NestedProjects) = preSolution

 		{7525BB88-6142-4A26-93B9-A30C6983390A} = {9D360D43-0C05-49D6-84DB-4E7AB2F38F82}

@@ -792,7 +820,6 @@ Global
 		{961B9266-C44A-42B6-BA3D-3FB229C9C417} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{02280E65-C507-4931-AE68-AA2E89E15EEF} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

-		{E68526B5-A464-461B-A58D-23F0EB28E7D2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{0F57E572-2359-4BAF-B302-6478C2E42FA2} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{481E1487-E0F1-4C6D-BD71-E572D9A19683} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

 		{75B9F2DF-4DEA-4007-965D-339563735EBE} = {D417E929-2B3A-46AC-BBE8-027ADB63A790}

@@ -869,6 +896,8 @@ Global
 		{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

 		{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

 		{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

+		{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

+		{E414CD46-33C8-4CE1-986F-B601F941EBB9} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}

 		{1497D0A8-AFF1-4938-BC22-BE79B358BA5B} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}

 	EndGlobalSection

 	GlobalSection(MonoDevelopProperties) = preSolution