Resolve merge conflicts. DMPRoadmap/roadmap#587

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

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571 ...

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571

tinymce refactoring for answers using JS. TODO adding events. DMPRoadmap/roadmap#571

tinymce gem removed from any view. DMPRoadmap/roadmap#571

tinymce answer events for editor working. DMPRoadmap/roadmap#571

fixed typos in js.erb template. DMPRoadmap/roadmap#571

extend renamed to define since more appropiate. DMPRoadmap/roadmap#571

switched every page to use bootstrap's row/col grid system DMPRoadmap/roadmap#552

front-end dependencies handled through npm. DMPRoadmap/roadmap#551

added aria tags to all fontawesome icons DMPRoadmap/roadmap#139

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

css tweaks to guidance pages

css rewrite

rebranding

updated org-admin customization of templates according to #373

Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272

Updated tests to work with updated controller

fix for multi-phase templates DMPRoadmap/roadmap#252

fixed if statement that allows the editable template details section to appear DMPRoadmap/roadmap#192

switched to using the hash for data access for admin_template view and associated partials

templates views according to gettext. DMPRoadmap/roadmap#98

Moved Actions, views, and partials for sections/phases/questions/suggested_answers out of templates, and wrote up associated authorization

removed User.org_type method and updated calls to in on some template views to use the new org.funder? instead

added theme unit tests and started cleanup of remaining existing tests

formatting and style changes

updated admin_template action and views, also removed spaces from affected files

renamed dmptemplates to templates