502 task - notification settings of each types
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Intranet/MainBundle/Entity/User.php
Merge remote-tracking branch 'origin/master'