added time markers feature
Merge branch 'extra_spike_features' into dev