removed n+1 queries from edit phase and show plans page

fixes generation of api_token when a user is given permissions for api

Merge pull request #469 from DigitalCurationCentre/issue459 ...

added remove_logo as permitted parameter.

added remove_logo as permitted parameter. DMPRoadmap/roadmap#459

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

Merge pull request #465 from DigitalCurationCentre/xsrust/bugfixes ...

Xsrust/bugfixes

updated guidance selection to ignore unpublished groups/guidances

only published guidance groups display for plan details

removed auto-publishing of groups by publishing guidance

allows guidances to save attributes other than text

accounting for tests not always having annotations (whereas views do)

Redirect to the referer URL when changing language. DMPRoadmap/roadmap#456

fixed question update logic, addresses #460

git Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

made docx title correspond to plan title, filename correspond to filename

Merge pull request #445 from DigitalCurationCentre/kmcgre/bugfixes ...

Remove guidances api controller and show action from guidance_groups …

Remove guidances api controller and show action from guidance_groups api controller

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

funder guidance now displays on customized templates

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

api updates

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

fixed bug where org not set by update function

enforce manditory fields on edit profile page

Filtering funders with published templates only - Closes #387

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

updated org-admin customization of templates according to #373

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes