Fixed answers display for each dataset in phase edition

Fixed plan set_test on Plan details & Creation

Datasets integration

Users can now choose one or multiple phases when exporting a plan

Added piwik cookies optout static page

Static pages edition integration

Default template should appear in template list on plan creation

Banner text saving in orgs in working properly

Commented overridden methods in controllers & models

Fix in mixin controllers call

Merged with DMPRoadmap:master

Funders should not appear in create account form and profile edit

Added slug to themes & theme API now uses slug

Merge branch 'master' into development

Merge pull request #2015 from DMPRoadmap/issue/2014 ...

issue/2014: Issues Preventing Shiboleth account creation or linking from the homescreen

updated ref (#2010)

fixed query (#2008)

updated sessions controller to no longer set shibboleth_id field on user account, changed devise registrations/new so the js could find the create-account-form.

Patch issue with share plans on development ...

Devise circumvents running validations on the user models when invite! is called.
I updated this call to adhere to validations, and I've updated the form to request the name,org of the user when a plan is shared with them.
This should fix the issue for both newly created share-plan users, and those with previous, bad data in the system.

You may want to consider re-running your validations(or fixup) scripts for users as you can have some invalid ones that you'll need to set a default name/org

made recommended adjustments

removed debug statements

finished up changes to controllers

Merge branch 'development' into issue1663

Fixes to French translation

updated Role, Plan logic and fixed tests

Updated api stats controller to use Org model's method (#1995) ...

* updated api stats controller to use Org model's  method

* updated org.plans to check role.active flag

* updated other api stats endpoints to use org.plans

refactor plan/role functionality to use flagshihtzu properly

moved deactivate logic to Role model and added specs

Issue #1931 - Share plan emails updated. ...

- The inviter name is added to the devise file app/views/devise/mailer/invitation_instructions.html.erb
- The name of person invited the plan is shared with is added to the greeting if it exists for both the devise
and non-devise emails (repectively app/views/devise/mailer/invitation_instructions.html.erb and app/views/user_mailer/sharing_notification.html.erb).
Otherwise, the invited person's email is displayed in the greetings.

Fix for #1931

1. stat_created_plan.to_csv with option for details by template. ...

2. details attribute for stats table #1679
3. create_created_plan_service extended with details by template
4. create_last_month_created_plan_service extended with details by
template.
5. create_or_update strategy for generating stats
6. StatCreatedPlanByTemplateController#index for graphs usage
7. month_start_date and month_end_date for OrgDateRangeable class

[RD-1679] Usage view including date input for plans by template

[#1679] monthly_range query updated

[#1679] client-side chart for plans by template

[#1679] Time picker for plans by template chart

[#1679] Download plans by template action.

deleted spec

merge conflicts fixed

[#1679] Removed JS linter warnings

[#1679] Rubocop conforming code. Drying out stat services