Merge pull request #800 from claroline/master

merge 3.2
Merge branch '3.2-dev' of https://github.com/claroline/CoreBundle