create VideoAnnotation model
create VideoAnnotations controller
add form so annotations can be added from video page
annotation timerange link now adjusts video appropriately
fix merge conflicts