content/annotation import (WIP)
Merge branch 'master' of https://github.com/vid/SenseBase