Merge pull request #2 from FriendsOfSymfony/master

Sync With FriendsOfSymfony/FOSUserBundle