Fixed test broken by new CSS changes and the removal of a few unessecarry show (e.g. org, guidance, etc.) pages

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP

updated column positions, project title lengths, and action item into dropdown list DMPRoadmap/roadmap#418

fix merge conflicts

saving password details separately

added new roadmap logo. started applying new css to plan edit page

move Orcid styling to roadmap-form css file

updated shibboleth-ds page so that column layouts are same size

fixed issure with public plans table filter

readded Dmproadmap.js as dmproadmap.js

removed Dmproadmap.js so that we can readd as dmproadmap.js ... git appears to ignore case but rails does not

fixed name of common Dmproadmap.js in application.rb

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

fix merge conflicts

include the additional preferences on user profile

added old admin.js back in to handle templates page. finsihed css rebuild of guidances and guidance groups

made toolbar a generic table filter. finished css restyling of users page

finished css rework on org edit

had to move jquery timeago back to root, added js for org edit page. fixed styling of header when org logo and banner are present

cleaned up references to js files in views

moved js and css files into structured directories

rebased with DCC go-live codebase

fixed merge conflicts

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

fixed rebase conflict

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

Rebase with latest code from DCC MVP

css tweaks to guidance pages

added accordion styling and js

moved jquery css into vendor directory

css rewrite