Removing changes from demo to apply them in SonataUserBundle

Needs https://github.com/sonata-project/SonataUserBundle/pull/325 to be merged before