added line to convert User to User.id on plan role assignment functions

added missing @user required by sharing_notification mailer

updated tests on plans_controller

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

Removed exclamation mark from uniq as it modifies the variable directly (instead of copying) and returns nil instead of an empty string if the array is empty

Added line to grab the first phase for the template if none is specified on the record

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

Merge pull request #45 from DMPRoadmap/development ...

Rebase after merging latest bug fixes

Merge branch 'development' into development

Merge pull request #255 from DigitalCurationCentre/development ...

Development

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

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

removed validate on User.password/email from user model because it conflicts with Devise's validation rules

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

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

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

added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236

added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files #DMPRoadmap/roadmap#236

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

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

fixed issue with question.options reference DMPRoadmap/roadmap#249

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

updated lock version notice form so that the text area uses the new class and the text is localised DMPRoadmap/roadmap#241

added answer-notice class that will make the lock version text area wider DMPRoadmap/roadmap#241