Merge branch 'development' into development

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

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

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

Funder and Institution displayed adequately. DMPRoadmap/roadmap#269

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

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

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

change docx export to htmltoword. Hopefully fixes: #217

Merge branch 'question_options' into development

further bug fix for show_export page and controller test for this endpoint

bug fix for show_export.html.erb and to jquery.timeago.js

fixed issues in plan edit template

added stub readonly form. it was missing from pull request

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

export text fields and areas. Fixes: https://github.com/DMPRoadmap/roadmap/issues/217

implimented new role backend according to #219

pdf exporting format fixed. DMPRoadmap/roadmap#222

docx exporting format fixed. DMPRoadmap/roadmap#222

changes into export to html to properly show admin details fields. DMPRoadmap/roadmap#197

Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197

export functionality according to workflow defined at DMPRoadmap/roadmap#197

updated roles controller to use strong parameters

change how updating various status indicators are done fixes: https://github.com/DMPRoadmap/roadmap/issues/182

Merge branch 'edit_answers_link#208' into development