Merge remote-tracking branch 'origin/3.0-dev' into facet-profile

Conflicts:
	Resources/views/Activity/index.html.twig
Administration facet profile API (WIP).
draft
WIP
Merge branch 'master' of https://github.com/claroline/CoreBundle into facet-profile

Conflicts:
	Listener/UnavailablePlatformListener.php
Facet and fields can be created in the administration (backend done).
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into facet-profile

Conflicts:
	Resources/views/Activity/index.html.twig
activity update
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Resources/views/Activity/index.html.twig
Merge pull request #635 from ngodfraind/facet-profile

Facet profile
activity update
Merge remote-tracking branch 'upstream/3.0-dev' into activity
primary resource optional
Facet administration front end (1st version)
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into facet-profile
Adding missing twigjs template to the layout.
small fixes
Merge pull request #637 from ngodfraind/facet-profile

Facet profile
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Resources/translations/platform.es.yml
	Resources/translations/platform.fr.yml
Merge pull request #636 from solispauwels/activity

Activity