VIX-444 - Unable to set change interval to less than 100ms in Alternating Effect

Modified AlternatingEffectEditorControl.cs - trackBarInterval.Minimum property to have a value of 1 instead of 100
Merge remote-tracking branch 'upstream/master'
VIX-197 - Corrected compile errors due to code merge
Added check in Text Converter Dialog code to protect against the possibility of null Mark Collection Names.
This protects against issue reported in VIX-463
VIX-463 - Aborting rename to Mark Collection causes name to be erased.  Added null check to after label edit function.
Merge branch 'master' of https://github.com/ebrady1/vixen