added in missing text to permission change email

Merge branch 'development' into development

Fixed nil user variable when generating HTML code for sharing notification. DMPRoadmap/roadmap#286 ...

added condition for avoiding sharing plan with email matching plans owner. DMPRoadmap/roadmap#286

Added message to internationalisation files. DMPRoadmap/roadmap#286

Removed description field when choosing a template for creating a plan. DMPRoadmap/roadmap#199

fixed merge conflict in schema.rb

Merge branch 'remove-settings' into development

Merge branch 'fix-template-controller' into development

updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55

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

section association sorted by number rather than id. DMPRoadmap/roadmap#269 ...

Funder and Institution displayed adequately. DMPRoadmap/roadmap#269

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

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

updated link to admin area to ensure that the user has permission to view that page, fixes #265

Removed extraneous .all

Updated email subjects and access removed message DMPRoadmap/roadmap#239

Updated email content and added new welcome message DMPRoadmap/roadmap#239

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

removed the devise confirmation requirement DMPRoadmap/roadmap#254

added line break before 'publish/unpublish' links

updated wording of template publication statuses DMPRRoadmap/roadmap#251

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

created model for annotation

switched helper scopes to class methods because scopes return all if nothing was found since we were using .first

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)