consolidated edit/add view and controller action for annotations ...

fixed tests

updated annotation show page to work for both template editing and plan answering

made adjustments from PR feedback