Merge branch 'master' of git://github.com/sall/vixen
- Fixed right-click add Mega Tree and Grid to honor the selection (or lack of a selection) to set the master when adding.
- Removed _1 appendage from the click actions.
- Tree does not collapse when adding items to the preview. So annoying!
- When items are added, the tree item is not de-selected and the items are still highlighted pink
- Pink (items highlighted in the tree) items are not un-highlighted when other items are selected in the preview, only when items are selected in the tree -- the intended behavior.
Merge branch 'master' of git://github.com/sall/vixen

Conflicts:
	Common/Controls/ElementTree.cs
Change the mega tree to show the actual number of strings defined instead of some multiple based on the number of degrees selected.

This has the side effect of requiring people to re-define the string count in their mega-trees in the preview.
(cosmetic) Removed the visible string count property because it is not used
Check if node is discrete when set and hold that value instead of making the full check on every intent state. Big reduction in ColorModule method invocations.
Expand pulse percentage option value to allow for up to 100%.
A little polish. Add remove audio option. Only being able to replace it with another audio was rude.
Expand pulse percentage option value to allow for up to 100% and even apply it based on the number of passes selected.
Merge remote-tracking branch 'remotes/derekbackus/master'
Merge remote-tracking branch 'remotes/jeffu231/master'
Merge remote-tracking branch 'remotes/gizmohd/master'

Conflicts:
	Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs
	Modules/EffectEditor/WipeEditor/WipeEditorControl.Designer.cs
Revert a lot of the formatting changes from Giz's merge.  (presumably still won't build yet).
Fix project output directories to be solution-relative.
Remove AnyCPU platform from the solution build. (Still have configurations in each project; can remove them later once x86 is tested and OK.)
Cleanup and some fixes to get it building again after the merge.
Merge pull request #22 from sall/master

Merge from sall/vixen