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
Merge remote-tracking branch 'remotes/derekbackus/master'