Fixing up the views related to annotations.
Merge branch 'master' of git_data_authority:DataAuthority/rads