made adjustments based on feedback DMPRoadmap/roadmap#150

fixed merge conflicts

Merge pull request #48 from DMPRoadmap/development ...

Rebase with shib/orcid functionality and template fix

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

Template bug fix

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

Merge pull request #296 from DigitalCurationCentre/feature/sso ...

Feature/sso

added in missing text to permission change email

Modified devise.rb example for SSO

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

switched defined function over to unique combobox events because they were conflicting when m,ultple boxes on the same screen

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

finalized initial create plan js

removed dmproadmap.scss from the javascripts dir. must have been copied over by accident. it was interfering with the load of css files

added new create plan page

Merge pull request #283 from CDLUC3/development ...

fixed a few tests after rebasing from DMPRoadmap

Merge branch 'development' into development

Merge pull request #292 from DigitalCurationCentre/development ...

Jose's email bugfixes

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.

Removed description field when choosing a template for creating a plan. DMPRoadmap/roadmap#199

Added gettext gem to find any string marked for translation. DMPRoadmap/roadmap#281 ...

Added to Gemfile and Gemfile.lock

Added string marked for translation in German. DMPRoadmap/roadmap#281

.gitignore excluding auto-generated files for gettext:find. DMPRoadmap/roadmap#281

Started adding in ajax call to retrieve list of templates

updated create plan so that submit button is disabled until both selections are made DMPRoadmap/roadmap#124

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

fixed some initial errors with tests after last PR