move most everything in the annotation directive to raw_val, and use a getter/setter for current.val
move setDefaultText to the annotation itself, instead of annotationController
create annotation.data_type and start breaking the new annot.type logic into annot.data_type
finish breaking out the date/number type logic to data_type
fix double content box on highlight date/number annotations
Merge branch 'annotation_types' into testing