Fix for super admin (new annotation model)

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

Integrate/resolve PR #319 - Closes #251.

Template versioning update.

Merge branch 'development' into template-publish-fix

updated template processing so that a new version is created when the user edits a published version. Updated tests to work with this new paradigm

updated tests to work after annotations changes

updated super admin to use annotations and model files accordingly

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

merged development into annotations

Upgraded Administrate (0.7.0), closes #266.

fixed merge conflicts after rebase

Fixes #307 - Single invitation email issue

updated org-admin interface to use annotations for template editing

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

Fixes #289 - when sharing plan with invalid email

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

began updating org-admin display of suggested_answers

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

made adjustments based on feedback DMPRoadmap/roadmap#150

fixed merge conflicts

fixed merge conflicts

Merge pull request #298 from CDLUC3/template-bug-fix ...

Template bug fix

renamed suggested_answer files to annotations

Merge branch 'fix-share-change-email' into template-bug-fix

Fixed failing functional & translation tests

Merge local branch into feature/sso - fixes #39, #276, #287, #290. ...

Unified omniauth cases & updated tests.
Deleted Project Controller & tests (no longer needed).
Please db:migrate after this commit.

updated plan creation messaging to match suggestions on DMPRoadmap/roadmap#207

fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293

minor css tweaks and added template title to default 'My Plan (title)'