pre pull commit
Merge branch 'master' of github.com:claroline/CoreBundle into claroline-cache

Conflicts:
	Manager/MailManager.php
Claroline cache system.
Merge pull request #329 from ngodfraind/claroline-cache

Claroline cache