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

Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

updated display of publish/unpublish buttons on templates index page

made adjustments to success message logic

updated controllers to use alert instead of notice for errors DMPRoadmap/roadmap#175

updated tests to work with new standardized success messages DMPRoadmap/roadmap#175

updated org-admin customization of templates according to #373

updated tests to work after annotations changes

updated org-admin interface to use annotations for template editing

renamed suggested_answer files to annotations