vv
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json

	src/FrontOffice/UserBundle/Resources/views/Profile/notifications.html.twig