Merge remote-tracking branch 'upstream/development' into annotations

merged development into annotations

Get rid of rogue fuzzy translations - Closes #239

Upgraded Administrate (0.7.0), closes #266.

Minor edits after PR

removed old shib handler from edit profile page

fixed merge conflicts after rebase

added answer partials back to plans dir even though they don't appear to be use in the UI. Added integration tests for template selection on create plan page

updated forms on create/edit plans, contact_us, profile pages to match consolidated css

updated names of files, consolidated new css, added accessible submit to contact us page

Fixes #307 - Single invitation email issue

updated org-admin interface to use annotations for template editing

Oops. Now Guidance Choices "Save" works again. #288

fixed bug with annotation selection

merged in latest changes from rework-create-plan

switched from using clickable to aria-disabled for submit button

switched from using clickable to aria-disabled for submit button

fixed 2 minor issues with aria tags

New display for Guidance choices in Plan Details page. Fixes #288

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

Fixes #289 - when sharing plan with invalid email

Bugfixes for invitations/ password change. Fixes #268, #271.

began updating org-admin display of suggested_answers

updated example answer text to display funder

fixed enum to be the same as used for migration

fixed unrelated bug where guidance acordians not opening

updated references of suggested_answer to annotations

simplification of create plan js and html presence of plan_template_id triggers submit button disabled

removed the old dropdowns_new_project partial as it is no longer being used

fixed tests