Merge branch 'master' of git://github.com/sall/vixen
Allow easy setting editing of height and width properties.
Change names to better reflect property value.
Add white as a preset.
Allow multiple element properties to be added at the same time.
Pull the 'checking for unset colors' code out of prerendering, into the property get() calls, to ensure it can never be unset. (It was possible to get into a state where the controls would try to display a null color/gradient.)
Merge pull request #18 from sall/master

Merge from sall/vixen
Update wipe effect to allow setting a specific number of wipes for the effect and the pulse length as a percent of the effect time. This allows the wipes to fall out evenly over the effect time. Original pulse length setting remains the default option.
Add default discrete color handling logic to Wipe effect.
updated app.config with template on how a user can log to their profile directory.  Otherwise default will log to the MyDocuments folder
Merge branch 'master' of https://github.com/gizmohd/vixen
Adjust overlapping controls.
Fix status bar for background rendering in sequencer
Fix the color blending when (a) blending a single color, (b) using input intents that have Color.Transparent.  (ie. use the opaque color, not the alpha-channel blended color).
Don't render unnecessary intents in nutcracker effects.
Merge remote-tracking branch 'remotes/derekbackus/master'
Disable profiles again temporarily.
Remove unused build batch files.
Clone the color breakdown filter data properly -- copy the bool for 'discrete colors' properly.
Update the README, now that it's a single solution...