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.
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