Rename dummy timeseries
Merge branch 'integration' into arjen_event_to_object
Layout and markup of events table