Merge branch 'master' into ui-refresh

Conflicts:
	extras/AspNetEdit/AspNetEdit.addin.xml
	extras/AspNetEdit/configure
	extras/BooBinding/BooBinding.addin.xml
	extras/BooBinding/configure
	extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
	extras/GeckoWebBrowser/configure
	extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
	extras/JavaBinding/JavaBinding.addin.xml
	extras/JavaBinding/configure
	extras/LuaBinding/LuaBinding.addin.xml
	extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
	extras/MonoDevelop.AddinAuthoring/configure
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
	extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
	extras/MonoDevelop.Database/configure.in
	extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Gdb/configure
	extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
	extras/MonoDevelop.Debugger.Mdb/configure
	extras/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
	extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
	extras/MonoDevelop.MeeGo/configure
	extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
	extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
	extras/MonoDevelop.Profiling/configure.in
	extras/NemerleBinding/NemerleBinding.addin.xml
	extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
	extras/PyBinding/PyBinding/PyBinding.addin.xml
	extras/PyBinding/configure
	extras/ValaBinding/ValaBinding.addin.xml
	extras/ValaBinding/configure.in
	extras/VersionControl.Subversion.Win32/VersionControl.Subversion.Win32/Manifest.addin.xml
	extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
	extras/WebKitWebBrowser/configure
	main/Main.sln
	main/build/MacOSX/release-info
	main/configure.in
	main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.addin.xml
	main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml
	main/src/addins/CBinding/CBinding.addin.xml
	main/src/addins/CSharpBinding/CSharpBinding.addin.xml
	main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml
	main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
	main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
	main/src/addins/GnomePlatform/GnomePlatform.addin.xml
	main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml
	main/src/addins/MacPlatform/MacPlatform.addin.xml
	main/src/addins/MonoDevelop.AnalysisCore/MonoDevelop.AnalysisCore.addin.xml
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
	main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml
	main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
	main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
	main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
	main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml
	main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
	main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
	main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.addin.xml
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListObject.cs
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml
	main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs
	main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeProjectTracker.cs
	main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
	main/src/addins/MonoDevelop.ProfilerGui/MonoDevelop.Profiler.addin.xml
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
	main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.addin.xml
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
	main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml
	main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
	main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
	main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
	main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
	main/src/addins/VBNetBinding/VBNetBinding.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
	main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
	main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
	main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.addin.xml
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
	main/src/core/MonoDevelop.Ide/BuildVariables.cs
	main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	version-checks

1 files changed, 27 insertions, 27 deletions

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
index 7f089276ba..e79e590fb7 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
@@ -12,67 +12,67 @@
 	<Runtime>
 		<Import assembly = "MonoDevelop.DesignerSupport.dll"/>
 	</Runtime>
-	
+
 	<Dependencies>
 		<Addin id="Core" version="4.0"/>
 		<Addin id="Ide" version="4.0"/>
 	</Dependencies>
 
 	<!-- Extension points -->
-	
+
 	<ExtensionPoint path = "/MonoDevelop/DesignerSupport/ToolboxProviders" name = "Toolbox item providers">
 		<Description>Provides items to the toolbox. Must implement MonoDevelop.DesignerSupport.Toolbox.IToolboxDefaultProvider and/or IToolboxDynamicProvider</Description>
 		<ExtensionNode name="Class" />
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/DesignerSupport/ToolboxLoaders" name = "Toolbox loaders">
 		<Description>Used to load ItemToolboxNodes into the ToolboxMust implement
 		MonoDevelop.DesignerSupport.Toolbox.IToolboxItemLoader</Description>
 		<ExtensionNode name="Class" />
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/DesignerSupport/PropertyProviders" name = "Providers for the property grid">
 		<ExtensionNode name="Class" />
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/DesignerSupport/ToolboxItemContextMenu" name = "Toolbox item context menu">
 		<Description>Context menu for toolbox items.</Description>
 		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet" />
 	</ExtensionPoint>
-	
+
 	<!-- Extensions -->
-	
+
 	<Extension path = "/MonoDevelop/DesignerSupport/PropertyProviders" extension-nodes="Class">
 		<Class class = "MonoDevelop.DesignerSupport.Projects.ProjectItemPropertyProvider"/>
 		<Class class = "MonoDevelop.DesignerSupport.Projects.SolutionItemPropertyProvider"/>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
 		<DataType class = "MonoDevelop.DesignerSupport.Toolbox.ToolboxItemToolboxNode" />
 		<DataType class = "MonoDevelop.DesignerSupport.Toolbox.TextToolboxNode" />
 		<DataType class = "MonoDevelop.DesignerSupport.Toolbox.TypeToolboxNode" />
 		<DataType class = "MonoDevelop.DesignerSupport.Toolbox.ItemToolboxNode" name = "item" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/Pads">
-		<Pad id = "MonoDevelop.DesignerSupport.ToolboxPad" 
-			class = "MonoDevelop.DesignerSupport.ToolboxPad" 
+		<Pad id = "MonoDevelop.DesignerSupport.ToolboxPad"
+			class = "MonoDevelop.DesignerSupport.ToolboxPad"
 			_label="Toolbox"
 			icon = "md-toolbox-pad"
 			defaultLayout="*"
 			defaultPlacement="Right"
 			defaultStatus="AutoHide"
 			/>
-		<Pad id = "MonoDevelop.DesignerSupport.PropertyPad" 
-			class = "MonoDevelop.DesignerSupport.PropertyPad" 
+		<Pad id = "MonoDevelop.DesignerSupport.PropertyPad"
+			class = "MonoDevelop.DesignerSupport.PropertyPad"
 			_label="Properties"
 			icon = "md-properties-pad"
 			defaultLayout="*"
 			defaultPlacement="MonoDevelop.DesignerSupport.ToolboxPad/bottom; right"
 			defaultStatus="AutoHide"
 			/>
-		<Pad id = "MonoDevelop.DesignerSupport.DocumentOutlinePad" 
-			class = "MonoDevelop.DesignerSupport.DocumentOutlinePad" 
+		<Pad id = "MonoDevelop.DesignerSupport.DocumentOutlinePad"
+			class = "MonoDevelop.DesignerSupport.DocumentOutlinePad"
 			_label="Document Outline"
 			icon="md-pad-document-outline"
 			defaultLayout="*"
@@ -80,7 +80,7 @@
 			defaultStatus="AutoHide"
 			/>
 	</Extension>
-	
+
 	<Extension path="/MonoDevelop/Ide/WorkbenchLayouts">
 		<Layout id="VisualDesign" _name="Visual Design">
 			<LayoutPad id="MonoDevelop.DesignerSupport.ToolboxPad" status="Dockable" />
@@ -88,13 +88,13 @@
 			<LayoutPad id="MonoDevelop.DesignerSupport.DocumentOutlinePad" status="Dockable" />
 		</Layout>
 	</Extension>
-	
+
 	<Extension path="/MonoDevelop/Ide/WorkbenchLayouts/Solution">
 		<LayoutPad id="MonoDevelop.DesignerSupport.ToolboxPad" placement="Right" status="AutoHide" />
 		<LayoutPad id="MonoDevelop.DesignerSupport.PropertyPad" placement="Right" status="AutoHide" />
 		<LayoutPad id="MonoDevelop.DesignerSupport.DocumentOutlinePad" placement="Right" status="AutoHide" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Core/StockIcons">
 		<StockIcon stockid = "md-design-categorise" resource = "group-by-category.png" size="Menu" />
 		<StockIcon stockid = "md-design-listboxtoggle" resource = "md-design-listboxtoggle.png" />
@@ -106,41 +106,41 @@
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
 		<NodeBuilder class = "MonoDevelop.DesignerSupport.Projects.ComponentNodeBuilder"/>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/Pads/ClassPad">
 		<NodeBuilder class = "MonoDevelop.DesignerSupport.Projects.ComponentNodeBuilder"/>
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/Commands">
 		<Command id = "MonoDevelop.DesignerSupport.Commands.SelectItems"
 				defaultHandler = "MonoDevelop.DesignerSupport.SelectItemsCommandHandler"
 				_label = "Add Items..." />
-		<Command id = "MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles" 
+		<Command id = "MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles"
 		         _label = "Switch between related files "
 		         _description = "Switch between related files, such as CodeBehind, headers, etc."
 		         defaultHandler="MonoDevelop.DesignerSupport.SwitchBetweenRelatedFilesCommand"
 		         shortcut="Control|Alt|Up"
 		         macShortcut="Meta|Alt|Up" />
 	</Extension>
-	
+
 	<Extension path="/MonoDevelop/Ide/ContextMenu/DocumentTab">
 		<CommandItem id = "MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles" />
-	</Extension>	
-	
+	</Extension>
+
 	<Extension path = "/MonoDevelop/DesignerSupport/ToolboxItemContextMenu">
 		<CommandItem id = "MonoDevelop.DesignerSupport.Commands.SelectItems" />
 		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<Class class = "MonoDevelop.DesignerSupport.Projects.PropertyPadTextEditorExtension" />
 		<Class class = "MonoDevelop.DesignerSupport.ClassOutlineTextEditorExtension" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/DesignerSupport/ToolboxProviders">
 		<Class class="MonoDevelop.DesignerSupport.Toolbox.CodeTemplateToolboxProvider" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Core/UserDataMigration">
 		<!-- 2.4 -->
 		<Migration sourceVersion="2.4" kind="LocalConfig" path="Toolbox.xml" />