Merge branch 'intervals' into mergeall3
Merge remote-tracking branch 'remotes/derek/master' into mergeall3
Merge remote-tracking branch 'remotes/derek/master' into mergeall3
Merge remote-tracking branch 'remotes/jeff/master' into mergeall3
Merge remote-tracking branch 'remotes/derek/master' into mergeall3
Merge branch 'intervals' into mergeall3
Merge remote-tracking branch 'remotes/tony/master' into mergeall3
Merge branch 'intervals' into mergeall3
Merge remote-tracking branch 'remotes/tony/master' into mergeall3
Merge remote-tracking branch 'remotes/jeff/master' into mergeall3
Merge remote-tracking branch 'remotes/tony/master' into mergeall3
Merge remote-tracking branch 'remotes/jeff/master' into mergeall3
Merge remote-tracking branch 'remotes/aurbo/master' into x
Revert Aurbo's unintented change to the sln file
Merge
Merge remote-tracking branch 'remotes/derekbackus/master' into master2

Conflicts:
	Common/Controls/TimeLineControl/Ruler.cs
	Modules/Editor/TimedSequenceEditor/Form_Marks.Designer.cs
	Modules/Editor/TimedSequenceEditor/Form_Marks.cs
	Modules/Editor/TimedSequenceEditor/Form_Marks.resx
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Modules/Effect/Nutcracker/Nutcracker.cs
	Modules/Effect/Nutcracker/NutcrackerData.cs
	Modules/Effect/Nutcracker/NutcrackerEffects.cs
	Modules/EffectEditor/NutcrackerEffectEditor/NutcrackerTypeEditorControl.Designer.cs
	Modules/EffectEditor/NutcrackerEffectEditor/NutcrackerTypeEditorControl.cs
	Modules/EffectEditor/NutcrackerEffectEditor/NutcrackerTypeEditorControl.resx
	Modules/Preview/VixenPreview/GDIPreview/GDIPreviewForm.cs
	Modules/Preview/VixenPreview/Shapes/PreviewPixelGrid.cs
Merge remote-tracking branch 'remotes/jeffu231/master' into master2

Conflicts:
	Modules/App/WebServer/HTTP/RequestDelegate.cs
	Modules/App/WebServer/WebServer.csproj
	Modules/Editor/TimedSequenceEditor/AudacityImportDialog.Designer.cs
	Modules/Editor/TimedSequenceEditor/AudacityImportDialog.cs
	Modules/Editor/TimedSequenceEditor/MarkManager.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditor.csproj
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.Designer.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorResources.Designer.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorResources.resx
	Modules/Effect/Pulse/Pulse.cs
	Modules/Preview/VixenPreview/VixenPreviewControl.cs
	Modules/Preview/VixenPreview/VixenPreviewData.cs
	Modules/Preview/VixenPreview/VixenPreviewSetup3.Designer.cs
	Modules/Preview/VixenPreview/VixenPreviewSetup3.cs
Reworked Toolbar after merge
Merge remote-tracking branch 'remotes/billutton/mergeall3' into master2

Conflicts:
	Application/VixenApplication/VixenApplication.csproj
	Common/Libraries/Libraries.csproj
	Modules/App/InstrumentationPanel/InstrumentationModule.cs
	Modules/App/SuperScheduler/ScheduleExecutor.cs
	Modules/App/SuperScheduler/StatusForm.cs
	Modules/Output/BlinkyLinky/BlinkyLinky.cs
	Modules/Output/BlinkyLinky/BlinkyLinkyData.cs
	Modules/Output/BlinkyLinky/BlinkyLinkyDescriptor.cs
	Modules/Output/DMXUSBPro/Descriptor.cs
	Modules/Output/DummyLighting/DummyLightingDescriptor.cs
	Modules/Output/OpenDMX/OpenDMXDescriptor.cs
	Modules/Preview/VixenPreview/GDIPreview/GDIPreviewForm.cs
	Modules/Preview/VixenPreview/VixenPreviewDescriptor.cs
	Modules/Preview/VixenPreview/VixenPreviewModuleInstance.cs
	Modules/Sequence/Vixen2x/Vixen2SequenceData.cs
	Vixen.System/Execution/Context/ContextBase.cs
	Vixen.System/Execution/ControllerUpdateAdjudicator.cs
	Vixen.System/IO/Policy/SystemConfigFilePolicy.cs
	Vixen.System/IO/Xml/Serializer/XmlControllerSerializer.cs
	Vixen.System/IO/Xml/SystemConfig/XmlSystemConfigFilePolicy.cs
	Vixen.System/Module/Controller/ControllerModuleDescriptorBase.cs
	Vixen.System/Module/Effect/EffectModuleInstanceBase.cs
	Vixen.System/Module/Preview/PreviewModuleDescriptorBase.cs
	Vixen.System/Module/SmartController/SmartControllerModuleDescriptorBase.cs
	Vixen.System/Sys/Element.cs
	Vixen.System/Sys/Execution.cs
	Vixen.System/Sys/Managers/ContextManager.cs
	Vixen.System/Sys/Managers/ElementManager.cs
	Vixen.System/Sys/Managers/FilterManager.cs
	Vixen.System/Sys/Managers/HardwareUpdateThread.cs
	Vixen.System/Sys/Output/IntervalUpdateSignaler.cs
	Vixen.System/Sys/SystemConfig.cs
	Vixen.System/Sys/VixenSystem.cs
	Vixen.System/Vixen.csproj
	Vixen.sln
Remove gitattributes