Merge remote-tracking branch 'remotes/billlutton/mergeall2'
Merge remote-tracking branch 'remotes/jeffu231/master'
Merge branch 'master' of https://github.com/sall/vixen

Conflicts:
	Modules/App/SuperScheduler/ScheduleItem.cs
Merge remote-tracking branch 'remotes/billlutton/mergeall2'