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)'

finalized initial create plan js

added new create plan page

Merge branch 'development' into development

Fixes to view templates and the way templates are collected DMPRoadmap/roadmap#251

updated create plan to call ajax action to get available templates

Fixed nil user variable when generating HTML code for sharing notification. DMPRoadmap/roadmap#286 ...

added condition for avoiding sharing plan with email matching plans owner. DMPRoadmap/roadmap#286

Added message to internationalisation files. DMPRoadmap/roadmap#286

Get rid of custom Shib code & revert to generic Omniauth for everything. Modify identifier_schemes table to add scheme specific urls.

Started adding in ajax call to retrieve list of templates

Updated styling of new jquery accessible dropdown and added fontawesome DMPRoadmap/roadmap#124

fixed merge conflict in schema.rb

Updated plans_controller and test to work with new create plan workflow DMPRoadmap/roadmap#150

Merge branch 'remove-settings' into development

Merge branch 'fix-template-controller' into development

updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234

removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254

Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248

moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273

moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag

Removed extraneous .all

Fixed issue with current_user.org ref for unaffiliated users. Then fixed issue with timing of plan creator assignment DMPRoadmap/roadmap#257

fixed pages so that they work with new controller logic DMPRoadmap/roadmap#251

updated tests to work with new template logic DMPRoadmap/roadmap#251