SONATA-384 - Improve account header block
Merge pull request #314 from eko/master

SONATA-384 - Improve account header block
Added User breadcrumb
Merge pull request #321 from sylvaindeloux/SONATA-218

Added User breadcrumb
Revert "fixed PHP Strict standards:  Declaration error."

This reverts commit 3a355729c50d62d5cb0548d6204e8a83ac53ed30.
fix method signature
Updated SonataUser controllers to completely override FOSUserBundle ones
Merge branch 'sonata-project/master'

Conflicts:
	Controller/AdminSecurityController.php
	Controller/ProfileFOSUser1Controller.php
	composer.json