Fix conflicts with merging dev into CDL

Added Request Feedback button to the share plan page ...

modifications to tooltips and email defaults

moved email constants to usermailer

aded missing colon

started adding in the button to request feedback

modifications to tooltips and email defaults

started adding in the button to request feedback

finsihed adding request feedback button

Removed old comment

switched to roles

updated to role based reviewer

updated user_mailer

moved feedback confirmation defaults to methods on UserMailer

added default visibility back to schema.rb

made adjustments based on PR feedback

refactored to use flagshihtzu function that returns values for flags

fixed issues with plan create page ...

moved template_+options method to templates controller

removed the default setting from plans.visibility ...

added migration to correct plan visibility

changed to nil

fixed broken tests and added check for branding.yml contact_us_url before overriding rails built in route helper

fixed issue with seeds.rb

Added Feedback Request to Org Details ...

Initial form changes for the New Org Details

added new db components for the org profile tab

split org page into tabs and updated profile form

switched section headers from labels to h3

finished org details tab

added feedback tab

made textarea a tinymce

fixed test broken by org controller update

Added btree back to schema.rb

added foreign keys back to schema.rb

fixed default email for feedback

Modifications to Project Details page per DMPRoadmap/roadmap#704 ...

added principal investigator email to the plans table

added a show data contact checkbox to project details page

added indexes back to scheme and set to use btree

fixed merge conflicts from pulling in latest bug fixes from development

updated db migration for mysql drop and then readd fkeys DMPRoadmap/roadmap#607

ran db migrations and npm install

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

Updated seeds.rb token_permission_types and question_formats and added rake task to apply fixes DMPRoadmap/roadmap#603

Apply all migrations.

Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

fixed broken tests and added functional tests for public_pages_controller

added active flag to roles

fixed issues with tests

made suggested changes from PR

fixed test broken by switch of Role update from html to json

finished up share plan page.

fixed merge conflicts in db/schema.rb

ran db:migrate

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

started refactoring the edit project details page DMPRoadmap/roadmap#491

removed n+1 queries from edit phase and show plans page

updates the indexes within the db to reflect those used in data access within the code

started switching template/phase/section pages over to new css

added initial edit plan redesign and refactored css so that the files aren't loading multiple times

Merge branch 'branding' into CDL-MVP

update the schema with user's prefs