fixed merge conflict in schema.rb

Merge branch 'remove-settings' into development

Merge branch 'fix-template-controller' into development

updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234

removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254

Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248

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

moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag

Removed extraneous .all

Fixed issue with current_user.org ref for unaffiliated users. Then fixed issue with timing of plan creator assignment DMPRoadmap/roadmap#257

fixed pages so that they work with new controller logic DMPRoadmap/roadmap#251

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

Updated tests to work with updated controller

Updated template controller to use new model helper methods. updates phase/section/question controllers to update template dirty flag. added new routes for customize, publish, unpublish

Removed early call to save the plan. It was creating extra plans (e.g. user gets directed to select a specific template, 2 plans were being created)

Ordered funders in dropdown - closes #260.

Was not actually using DOCX export but dumping to HTML. Should work now (closes #217).

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

updated models to relfect new name for join table between plans and guidance groups. fixes #198

updated logic to unpublish older versions when a version is published

updated spacing in mailers based on @xsrust changes to the sharing notification

Merge branch 'development' into development

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

Updated ActionMailer deliver calls to deliver_now because deliver is deprecated in Rails 5

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

updated answers controller so that user_id is not a part of the find_by DMPRoadmap/roadmap#241

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

updated function call to sharing_notification mailer