New annotations approach
Use dates instead of integers
Use either series name or index
Merge branch 'canvas-annotations'