fixed merge conflicts in db/schema.rb

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

Merge branch 'CDL-MVP' into CDL-MVP

ran gettext:find and gettext:po_to_json

Adds copy template option #148

fixed issue with Shib logout url

set default plan visibility to 'private'

Made super admin dashboards a bit less dangerous by removing destroy

fixed merge conflicts

fix merge conflicts

updated translations from plan_details page

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

adds disk option for bullet display

added bullet point options to tinymce editor. circle and square export correctly. Addresses #464

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

fix merge conflicts

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

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

moved jquery css into vendor directory

css rewrite

move the user profile tabs into separate forms

auto-saving working but needs some improvement. DMPRoadmap/roadmap#438 ...

auto-saving debounce function per form and considering optimistic-locking. DMPRoadmap/roadmap#438

Added focus handler for textarea in order to also cancel debounce. DMPRoadmap/roadmap#438

made tinymce boxes resize automatically

gave tables a default border so they will export properly in docx