notification settings - on\off all
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Intranet/MainBundle/Controller/UserController.php