finished plan share and edit pages. Updated styling and handling or alert/notice messages. Updated css to allow background color, alert message and notice message colors to be set in dmproadmap.scss

updated preferences to use JSON hash and be contained in a new model, addresses #481

Adds copy template option #148

move the user profile tabs into separate forms

Added public DMPs page

fixed merge conflicts

fixed merge conflicts

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

api updates

updated size of shib_ds page org list columns and updated org links DMPRoadmap/roadmap#405

shibboleth_ds changes to make org list links work DMPRoadmap/roadmap#405

added shibboleth Login.sso with entityID passthru action DMPRoadmap/roadmap#405 ...

(cherry picked from commit 314b24e)

added new custom shib ds page ...

(cherry picked from commit 5951ebe)

resolved merge conflicts from merging development 2016-06-09 into CDL-MVP

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

updated routes from put to get for admin_customize, addresses part of #370

Plan duplication functionality. ...

Ability to Create a Plan copy

removing guidances being copied over since they requrie omly references

Plan deep copy method to duplicate plans (associated answers and guidance_groups)

Append 'Copy of' to the title of a duplicated plan

Fixes for #311, #345.

updated tests to work after annotations changes

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

merged development into annotations

Upgraded Administrate (0.7.0), closes #266.

updated org-admin interface to use annotations for template editing

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.

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

Merge branch 'fix-template-controller' into development

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

Updated template controller to use new model helper methods. updates phase/section/question controllers to update template dirty flag. added new routes for customize, publish, unpublish

Added admin :show action missing from routes.rb - oops.