updated org-admin and plan create pages to reflect schema change

Fixes for #311, #345.

updated tests to work after annotations changes

merged development into annotations

updated references of suggested_answer to annotations

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.

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

fixed merge conflict in schema.rb

removed the current migration for annotations as they were introduced earlier in migration process

created migration from suggested_answers and question.guidance according to #223

forgot to add the schema changes DMPRoadmap/roadmap#251

Added dirty flag to templates. Added rake tasks to cleanup bad data

removed migrations which have been removed from migration_step_3

updated models to relfect new name for join table between plans and guidance groups. fixes #198

added dmptemplate_id to the Template creations in db seeds file and test_helper

change docx export to htmltoword. Hopefully fixes: #217

resolved rebase conflicts from merge with development

switched I18n.locale to FastGettext

Merge branch 'development' into development

updated seeds to use managing institution abbreviation instead of hard-coded 'CC'. Added basic functional tests for templates controller with small adjustments to check for nils in view and controller

Change notes to work with AJAX calls.

added logic to db/seeds.rb to always create a default org for the one defined in config/branding.yml. This is the managing org

reverted changes to application_controller and schema.rb

Merge branch 'development' of https://github.com/CDLUC3/roadmap into development

Quick fix for i18n issue which prevents db:setup because of lack of Languages table

started switching I18n references in test files to Fastgettext

resolve conflicts from merging Roadmap into DCC

removed some old empty test files. removed facebook example from identifier_schemes seed

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now DMPRoadmap/roadmap#159

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now