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

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

replaced all of the old ? help boxes with fontawesome question marks

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

fixed merge conflicts

Fixed problem of loading tinymce styles for production environment.

rebranding

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Template versioning update.

broken generic error message handler apart into separate create/update/destroy versions. updated calls within the controllers and fixed tests DMPRoadmap/roadmap#227

phases 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