Resolve merge conflicts. DMPRoadmap/roadmap#587

Merge pull request #594 from DigitalCurationCentre/vyruss/CDL-MVP ...

New Bootstrap main layout & backport bugfixes

Removed styles from HTML & other minor tweaks

New Bootstrap 3 main layout/refactoring of partials

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

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

Merge pull request #591 from CDLUC3/issue564 ...

Bootstrapped the public plans and public templates

updated spelling mistake

updated plan creation logic to disallow outdated customizations

updated display of publish/unpublish buttons on templates index page

Resolve merge conflicts. DMPRoadmap/roadmap#553

Merge pull request #586 from CDLUC3/issue557 ...

bootstrapped help and roadmap static pages DMPRoadmap/roadmap#557

bootstrapped help and roadmap static pages DMPRoadmap/roadmap#557

bootstrapped the public plans and public templates pages DMPRoadmap/roadmap#564

refactored debounce call on tablesorter DMPRoadmap/roadmap#553

removed non-relevant modal at phases/edit.html.erb. DMPRoadmap/roadmap#566 ...

Doing some housekeeping for non-relevant modals. DMPRoadmap/roadmap#566

modals according to bootstrap. DMPRoadmap/roadmap#554

modal partial as layout to be re-used across the site. DMPRoadmap/roadmap#554

fixes bug with duplicate guidance and adds rake task to cleanup database

switched collateTable to use tablesorter's icons, switched filterizeTable to use debounce. DMPRoadmap/roadmap#553

wrapped each page's h1 header in a row + col-md-12 DMPRoadmap/roadmap#553

bootstrapped the my dashboard page and added new JS files to application.js DMPRoadmap/roadmap#553

boostrapped the shared table filter DMPRoadmap/roadmap#553

added boostrap row + col-md-12 to header portion of about us page to folow format used on other pages DMPRoadmap/roadmap#553

Contact us bootstrapped and with aria attributes controller through JS. DMPRoadmap/roadmap#554 ...

Contact us using dmproadmap.utils.ariatiseForm for validation states at control forms and taking into account aria. DMPRoadmap/roadmap#554

Removed console.log. DMPRoadmap/roadmap#554

fixed merge conflicts DMPRoadmap/roadmap#555

aa. DMPRoadmap/roadmap#571 ...

Reverted to Gemfile and Gemfile.lock compatible to pass tests. DMPRoadmap/roadmap#571

Merge branch 'CDL-MVP' into issue571

updated about_us to use Boostrap's tabs DMPRoadmap/roadmap#555

removed debug statement from forms.js DMPRoadmap/roadmap#555

commented out old css and js for tabs DMPRoadmap/roadmap#555

added bootstrap to dependencies DMPRoadmap/roadmap#555

updated gitignore that was preventing new overrides.scss from being committed DMPRoadmap/roadmap#573