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

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

realized answer policy was never firing. updated create? to update? and fixed typo DMPRoadmap/roadmap#241

Added admin :show action missing from routes.rb - oops.

Fixes issues discussed in DMPRoadmap/roadmap#132

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

updated function call to sharing_notification mailer

fixes spacing issues in share plan mailer and adds additional dialog

Merge branch 'docx_export_htmltoword' into development

change docx export to htmltoword. Hopefully fixes: #217

Merge branch 'question_options' into development

change options to question_options

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

Merge branch 'correct_section_order' into development

order sections by number

removed old reference to plan.to_hash

fixes issue with changing roles for a shared plan #231

Merge branch 'create_plan_permissions' into development

assign permissions on create plan. Fixes: #220

hide language dropdown on profile page if there is only one language available DMPRoadmap/roadmap#237