made adjustments based on feedback DMPRoadmap/roadmap#150

fixed merge conflicts

fixed merge conflicts

added dropdowns back

updated new css and swapped out use of table with fieldset on plan details edit DMPRoadmap/roadmap#125

Fixed failing functional & translation tests

fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293

minor css tweaks and added template title to default 'My Plan (title)'

finalized initial create plan js

removed dmproadmap.scss from the javascripts dir. must have been copied over by accident. it was interfering with the load of css files

added new create plan page

Merge branch 'development' into development

updated create plan to call ajax action to get available templates

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

Started adding in ajax call to retrieve list of templates

updated create plan so that submit button is disabled until both selections are made DMPRoadmap/roadmap#124

Updated styling of new jquery accessible dropdown and added fontawesome DMPRoadmap/roadmap#124

fixed merge conflict in schema.rb

replaced old create plan page with new, cleaner html version DMPRoadmap/roadmap#150

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