Added changes to allow for two solutions. One that uses the Vixen Core source for the main Dev team and
One that uses the binary build. Config is based on the solution loaded. Updates to all project files
that require the Vixen core as well as the common properties file.
Changes for Bug 69 and 70.
Add output directory to ignore.
Merge remote-tracking branch 'original/master'

Conflicts:
	.gitignore
	Application/VixenApplication/VixenApplication.csproj
	Common/BaseSequence/BaseSequence.csproj
	Common/BasicInputManagement/BasicInputManagement.csproj
	Common/Controls/Controls.csproj
	Common/ScriptSequence/ScriptSequence.csproj
	Modules/App/ColorGradients/ColorGradients.csproj
	Modules/App/Curves/Curves.csproj
	Modules/App/DisplayPreviewModule/DisplayPreview.csproj
	Modules/App/InputEffectRouter/InputEffectRouter.csproj
	Modules/App/InstrumentationPanel/InstrumentationPanel.csproj
	Modules/App/Scheduler/Scheduler.csproj
	Modules/Editor/ScriptEditor/ScriptEditor.csproj
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditor.csproj
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.Designer.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceElement.cs
	Modules/Effect/Candle/Candle.csproj
	Modules/Effect/Chase/Chase.csproj
	Modules/Effect/ColorWithIntent/ColorWithIntent.csproj
	Modules/Effect/ImageGrid/ImageGrid.csproj
	Modules/Effect/Pulse/Pulse.csproj
	Modules/Effect/RampWithIntent/RampWithIntent.csproj
	Modules/Effect/SetLevel/SetLevel.csproj
	Modules/Effect/SetPosition/SetPosition/SetPosition.csproj
	Modules/Effect/Spin/Spin.csproj
	Modules/Effect/Twinkle/Twinkle.csproj
	Modules/EffectEditor/ChaseEffectEditor/ChaseEffectEditor.csproj
	Modules/EffectEditor/ColorGradientTypeEditor/ColorGradientTypeEditor.csproj
	Modules/EffectEditor/ColorTypeEditor/ColorTypeEditor.csproj
	Modules/EffectEditor/CurveTypeEditor/CurveTypeEditor.csproj
	Modules/EffectEditor/FilePathTypeEditor/FilePathTypeEditor.csproj
	Modules/EffectEditor/LevelTypeEditor/LevelTypeEditor.csproj
	Modules/EffectEditor/SpinEffectEditor/SpinEffectEditor.csproj
	Modules/EffectEditor/TwinkleEffectEditor/TwinkleEffectEditor.csproj
	Modules/Input/DirectXJoystick/DirectXJoystick.csproj
	Modules/Media/Audio/Audio.csproj
	Modules/Output/595/Olsen595.csproj
	Modules/Output/BlinkyLinky/BlinkyLinky.csproj
	Modules/Output/DMXUSBPro/DmxUsbPro.csproj
	Modules/Output/DummyLighting/DummyLighting.csproj
	Modules/Output/E1.31/E131.csproj
	Modules/Output/Hill320/Hill320.csproj
	Modules/Output/PSC/PSC/PSC.csproj
	Modules/Output/Renard/Renard.csproj
	Modules/PostFilter/Color/Color.csproj
	Modules/PostFilter/Grayscale/Grayscale.csproj
	Modules/PreFilter/FadeOut/FadeOut.csproj
	Modules/Property/Grid/Grid.csproj
	Modules/Property/Position/Position.csproj
	Modules/RuntimeBehavior/Recording/Recording.csproj
	Modules/Script/CSharp/CSharp.csproj
	Modules/Script/VB/VB.csproj
	Modules/Sequence/Script/Script.csproj
	Modules/Sequence/Vixen2x/Vixen2x.csproj
	Modules/Timing/Generic/Generic.csproj
	VixenModules.sln
	commonProject.props
Merge remote-tracking branch 'original/master'

Conflicts:
	.gitignore
	Application/VixenApplication/VixenApplication.csproj
	Common/BaseSequence/BaseSequence.csproj
	Common/BasicInputManagement/BasicInputManagement.csproj
	Common/Controls/Controls.csproj
	Common/ScriptSequence/ScriptSequence.csproj
	Modules/App/ColorGradients/ColorGradients.csproj
	Modules/App/Curves/Curves.csproj
	Modules/App/DisplayPreviewModule/DisplayPreview.csproj
	Modules/App/InputEffectRouter/InputEffectRouter.csproj
	Modules/App/InstrumentationPanel/InstrumentationPanel.csproj
	Modules/App/Scheduler/Scheduler.csproj
	Modules/Editor/ScriptEditor/ScriptEditor.csproj
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditor.csproj
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.Designer.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Modules/Editor/TimedSequenceEditor/TimedSequenceElement.cs
	Modules/Effect/Candle/Candle.csproj
	Modules/Effect/Chase/Chase.csproj
	Modules/Effect/ColorWithIntent/ColorWithIntent.csproj
	Modules/Effect/ImageGrid/ImageGrid.csproj
	Modules/Effect/Pulse/Pulse.csproj
	Modules/Effect/RampWithIntent/RampWithIntent.csproj
	Modules/Effect/SetLevel/SetLevel.csproj
	Modules/Effect/SetPosition/SetPosition/SetPosition.csproj
	Modules/Effect/Spin/Spin.csproj
	Modules/Effect/Twinkle/Twinkle.csproj
	Modules/EffectEditor/ChaseEffectEditor/ChaseEffectEditor.csproj
	Modules/EffectEditor/ColorGradientTypeEditor/ColorGradientTypeEditor.csproj
	Modules/EffectEditor/ColorTypeEditor/ColorTypeEditor.csproj
	Modules/EffectEditor/CurveTypeEditor/CurveTypeEditor.csproj
	Modules/EffectEditor/FilePathTypeEditor/FilePathTypeEditor.csproj
	Modules/EffectEditor/LevelTypeEditor/LevelTypeEditor.csproj
	Modules/EffectEditor/SpinEffectEditor/SpinEffectEditor.csproj
	Modules/EffectEditor/TwinkleEffectEditor/TwinkleEffectEditor.csproj
	Modules/Input/DirectXJoystick/DirectXJoystick.csproj
	Modules/Media/Audio/Audio.csproj
	Modules/Output/595/Olsen595.csproj
	Modules/Output/BlinkyLinky/BlinkyLinky.csproj
	Modules/Output/DMXUSBPro/DmxUsbPro.csproj
	Modules/Output/DummyLighting/DummyLighting.csproj
	Modules/Output/E1.31/E131.csproj
	Modules/Output/Hill320/Hill320.csproj
	Modules/Output/PSC/PSC/PSC.csproj
	Modules/Output/Renard/Renard.csproj
	Modules/PostFilter/Color/Color.csproj
	Modules/PostFilter/Grayscale/Grayscale.csproj
	Modules/PreFilter/FadeOut/FadeOut.csproj
	Modules/Property/Grid/Grid.csproj
	Modules/Property/Position/Position.csproj
	Modules/RuntimeBehavior/Recording/Recording.csproj
	Modules/Script/CSharp/CSharp.csproj
	Modules/Script/VB/VB.csproj
	Modules/Sequence/Script/Script.csproj
	Modules/Sequence/Vixen2x/Vixen2x.csproj
	Modules/Timing/Generic/Generic.csproj
	VixenModules.sln
	commonProject.props
Remove uneeded test solution.
Organize NShape output to match other common projects and change VixenApplication to use project reference rather than binary reference.
Changes for Clipboard Bug 65
Fixed up the NShape output directories to work properly with both solution locations.