Updated Installer
Fixed reference and missing file
Updated references
Minor fixes to how NShape  build was configured.  Had to force NShape to ANyCPU and .NET 2.0  so that NShape modules would properly show in the designer
Change the Editor toolbars from three separate to one combined to utilize the space
Changed width on Audio Device dropdown
Git insists these need committing even tho nothing has changed
Revert "First Stab at migrating many of the Double objects to Float's"

This reverts commit 3f6db598a75958fc45aa9667ec6567b638c775a6.

Conflicts:
	Common/Controls/ColorPicker/ColorPicker.cs
	Common/Controls/ColorPicker/ColorSelectionFader.cs
	Common/Controls/ColorPicker/ColorSelectionModules_HSV.cs
	Common/Controls/ColorPicker/ColorSelectionModules_LAB.cs
	Common/Controls/ColorPicker/ColorSelectionModules_RGB.cs
	Common/Controls/ColorPicker/ColorSelectionPlane.cs
	Modules/App/ColorGradients/ColorGradient.cs
	Modules/App/ColorGradients/GradientEdit.cs
	Modules/App/ColorGradients/GradientEditPanel.cs
	Modules/App/Curves/Curve.cs
	Modules/Effect/Chase/Chase.cs
	Modules/Effect/Spin/Spin.cs
	Modules/Effect/Twinkle/Twinkle.cs
	Modules/PostFilter/DimmingCurve/DimmingCurveModule.cs
	Vixen.System/Data/Value/LightingValue.cs
	Vixen.System/Data/Value/PositionValue.cs
	Vixen.System/Interpolator/Interpolator.cs
	Vixen.System/Interpolator/LightingValueInterpolator.cs
	Vixen.System/Interpolator/PositionValueInterpolator.cs
	Vixen.System/Interpolator/RGBValueInterpolator.cs
	Vixen.System/Interpolator/StaticValueInterpolator.cs
Updated Version Control Module with Load Status indicator
Merge remote-tracking branch 'remotes/sallvixen/master'

Conflicts:
	Installer/Vixen-installer.nsi
	Installer/Vixen-installer.x64.nsi
	Installer/Vixen-installer.x64_DevBuild.nsi
	Installer/Vixen-installer_DevBuild.nsi
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Vixen.sln
Revert "Git insists these need committing even tho nothing has changed"

This reverts commit 42f78e64d6dd907d1e9b352bfaf0c234f815128e.

Conflicts:
	Common/Controls/ColorPicker/ColorPicker.cs
	Common/Controls/ColorPicker/ColorSelectionFader.cs
	Common/Controls/ColorPicker/ColorSelectionModules_HSV.cs
	Common/Controls/ColorPicker/ColorSelectionModules_LAB.cs
	Common/Controls/ColorPicker/ColorSelectionModules_RGB.cs
	Common/Controls/ColorPicker/ColorSelectionPlane.cs
	Modules/App/ColorGradients/ColorGradient.cs
	Modules/App/ColorGradients/GradientEdit.cs
	Modules/App/ColorGradients/GradientEditPanel.cs
	Modules/App/Curves/Curve.cs
	Modules/Effect/Chase/Chase.cs
	Modules/Effect/Spin/Spin.cs
	Modules/Effect/Twinkle/Twinkle.cs
	Modules/PostFilter/DimmingCurve/DimmingCurveModule.cs
	Vixen.System/Data/Value/LightingValue.cs
	Vixen.System/Data/Value/PositionValue.cs
	Vixen.System/Interpolator/Interpolator.cs
	Vixen.System/Interpolator/LightingValueInterpolator.cs
	Vixen.System/Interpolator/PositionValueInterpolator.cs
	Vixen.System/Interpolator/RGBValueInterpolator.cs
	Vixen.System/Interpolator/StaticValueInterpolator.cs
Failed revert... made the app unbuildable....
Revert "Revert "First Stab at migrating many of the Double objects to Float's""

This reverts commit 31df9c86ed8b0466aa6c960accfff8856c4eacd6.

Conflicts:
	Modules/App/ColorGradients/ColorGradient.cs
Revert "First Stab at migrating many of the Double objects to Float's"

This reverts commit 3f6db598a75958fc45aa9667ec6567b638c775a6.

Conflicts:
	Common/Controls/ColorPicker/ColorPicker.cs
	Common/Controls/ColorPicker/ColorSelectionFader.cs
	Common/Controls/ColorPicker/ColorSelectionModules_HSV.cs
	Common/Controls/ColorPicker/ColorSelectionModules_LAB.cs
	Common/Controls/ColorPicker/ColorSelectionModules_RGB.cs
	Common/Controls/ColorPicker/ColorSelectionPlane.cs
	Modules/App/ColorGradients/ColorGradient.cs
	Modules/App/ColorGradients/GradientEdit.cs
	Modules/App/ColorGradients/GradientEditPanel.cs
	Modules/App/Curves/Curve.cs
	Modules/Effect/Chase/Chase.cs
	Modules/Effect/Spin/Spin.cs
	Modules/Effect/Twinkle/Twinkle.cs
	Modules/PostFilter/DimmingCurve/DimmingCurveModule.cs
	Vixen.System/Data/Value/LightingValue.cs
	Vixen.System/Data/Value/PositionValue.cs
	Vixen.System/Interpolator/Interpolator.cs
	Vixen.System/Interpolator/LightingValueInterpolator.cs
	Vixen.System/Interpolator/PositionValueInterpolator.cs
	Vixen.System/Interpolator/RGBValueInterpolator.cs
	Vixen.System/Interpolator/StaticValueInterpolator.cs
UPdated pulse
Fix VersionCOntrol where it wasnt getting committed until after a 10second wait.. And, updated commits were not available to view until after the application restarted
Remove references to VB2005 Powerpacks assembly
Updated Version Control filewatchers
Fix to AutomaticMusicDetection to prevent an exception from firing after a user has uses the tool and closes the mark manager form
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