integrating user bundle (requires FOSUserBundle)
Merge origin/master