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

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

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

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

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

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 updated controller

removing the public DMP link from nav bar

transferred all_guidance_groups over to a locals variable when being passed into the partial.

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

Merge branch 'development' into development

fixes guidance group selection for plans

removed filter button and settings cog icon from view plans page DMPRoadmap/roadmap#248

patch for missed localisation in fix for DMPRoadmap/roadmap#207

Updated general application layout to display flash[:notice/:alert] as raw DMPRoadmap/roadmap#234

fixed issue with share tab not being marked as active tab DMPRoadmap/roadmap#250

fix for multi-phase templates DMPRoadmap/roadmap#252

fix to one of the mailer's localisation

updated remaining mailers to use fastgettext default locale and fixed spacing issues. DMPRoadmap/roadmap#239

Updated main user_mailer to use FastGettext.default_locale instead of I18n and setup email confirmation to use branding. DMPRoadmap/roadmap#238