Fixes claroline/CoreBundle#664
Merge branch 'master' of https://github.com/claroline/CoreBundle into bugfix
Using correct exception.
Merge pull request #705 from ngodfraind/bugfix

Bugfix
Notifications are sent by email by default.
Merge pull request #709 from ngodfraind/user-notifications

Notifications are sent by email by default.
Mail servers parameters can be reset.
renaming edit by setParameter.
Merge pull request #710 from ngodfraind/bugfix

Mail servers parameters can be reset.
Merge branch 'master' into 3.0-dev

Conflicts:
	Controller/ProfileController.php
	Manager/CacheManager.php
Merge pull request #713 from stefk/merge-master

Merge master