Fixing missing value bug
Default round(1) and color option on mark()
Indexed event bugfix
Spike mean rate bugfix
More flexible pset setConditionDescriptor and setAlignDescriptorSet
yOffset bug with empty conditions
Merge branch 'master' of github.com:djoshea/trial-data

Conflicts:
	ChannelDescriptor.m