partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into ergonomy

Conflicts:
	Resources/views/Tool/workspace/agenda/agenda.html.twig
ergo
Translations.
 ergonomy
Merge pull request #410 from ngodfraind/ergo

ergo
 check style
Merge pull request #411 from easy-es/ergonomy

Ergonomy
Renaming "lines_per_page".
Merge pull request #412 from ngodfraind/ergo

Renaming "lines_per_page".