Fix conflicts with merging dev into CDL

fixes tests on development

fixed issues with plan create page ...

moved template_+options method to templates controller

after_create plan callback for saving answers. TODO error handling at answers#update. DMPRoadmap/roadmap#530 ...

error handling for when an answer does not exist. DMPRoadmap/roadmap#530

error handling for answering questions. DMPRoadmap/roadmap#530

optimistic locking fixed. DMPRoadmap/roadmap#530

fixed tests after create callback for answers. Refactored answers js file. DMPRoadmap/roadmap#530

added changes back in

DMPRoadmap/roadmap#562 ...

edit phases using plan navigation layout

bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse

answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js

Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor

fixed broken test regarding answers_controller

fixed tests to deal with placement of welcome header on home page DMPRoadmap/roadmap#305 ...

(cherry picked from commit 0d56b3d)

Changed error text - closes #382.

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

bugfixes to allow tests to work

Updated tests.

Template versioning update.

added answer partials back to plans dir even though they don't appear to be use in the UI. Added integration tests for template selection on create plan page

commented out plan creation integration test. the workflow will be changing soon

debug line for travis.ci issue

debug line for travis.ci issue

debug line for travis.ci issue

debug line for travis.ci issue

fixed integration tests for templates

moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273

updated wording of template publication statuses DMPRRoadmap/roadmap#251

updated tests to work with new template logic DMPRoadmap/roadmap#251

finished integration tests for template versioning. added helper method tests to template unit tests

trying to add default scoping for template

added initial integration tests for template versioning logic

finished fixes for answer creation race condition DMPRoadmap/roadmap#241

updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241

fixed the rest of the tests by swapping out I18n and removing locales from routes

resolved merge conflicts

fixed authentication integration test. updated test_helper to compensate for Devise sometimes having an intermediate redirect