fixed merge conflicts

Merge pull request #79 from DMPRoadmap/CDL-MVP ...

Pulling in initial ES6 changes

Merge pull request #602 from DigitalCurationCentre/issue601 ...

DMPRoadmap/roadmap#601

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

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

Development

is module and travis configuration tweaked. DMPRoadmap/roadmap#601 ...

is module and spec. Set up karma for unit test. DMPRoadmap/roadmap#601

Added constants, isValidInputType and debounce as ES6 modules. DMPRoadmap/roadmap#601

Merge pull request #77 from DMPRoadmap/CDL-MVP ...

Cdl mvp

tweaks to constants and ariatise per PR feedback DMPRoadmap/roadmap#558

Merge pull request #600 from DigitalCurationCentre/issue587 ...

DMPRoadmap/roadmap#587

Resolve merge conflicts. DMPRoadmap/roadmap#587

removed console.log debug statement DMPRoadmap/roadmap#558

Merge branch 'CDL-MVP' into issue558

Merge pull request #76 from DMPRoadmap/CDL-MVP ...

Latest bug fixes from development, updated header/footer, public plans and templates

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

New Bootstrap main layout & backport bugfixes

Removed styles from HTML & other minor tweaks

added constants.js, modified ariatiseForm.js, bootstrapped devise invitation/password reset pages DMPRoadmap/roadmap#558

New Bootstrap 3 main layout/refactoring of partials

Apply all migrations.

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

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

Merge pull request #593 from DigitalCurationCentre/xsrust/bugfixes ...

bugfixes to live service

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

Bootstrapped the public plans and public templates

Switched to bootstrap-sass in view of upgrade of bootstrap to v4 which only uses Sass

updated templates_controller_test to validate new assumption that customizations are dirty

updated spelling mistake

updated rake task to remember which annotations should be preserved

updated plan creation logic to disallow outdated customizations

updated display of publish/unpublish buttons on templates index page

Merge pull request #73 from DMPRoadmap/CDL-MVP ...

Pulling over latest changes

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

Pulling over latest bug fixes from DMPRoadmap