travis-ci image branch fix
Merge pull request #746 from leonardo-proietti/1.2.x

travis-ci image fixed for branch 2.1.x
Update Resources/translations/validators.fr.yml
Update Resources/translations/validators.fr.yml
Found a little typo
Fixed couple typos
Fix typo in canonicalizer configuration example

services -> service
(indent) space missing at line 223
Merge pull request #870 from Ephasme/patch-1

(indent) space missing at line 223
Fix typo in canonicalizer configuration example

services -> service
Merge branch 'master' of github.com:StuBez/FOSUserBundle
Revert incorrect change to services configuration.
Merge pull request #861 from sstok/patch-2

Update Resources/translations/validators.fr.yml
Merge pull request #866 from StuBez/master

Typo in canonicalizer configuration doc
Merge pull request #863 from bjdelange/master

Found a little typo
Update Resources/translations/validators.zh_CN.yml

Add fos_user.password.mismatch translation for Chinese Simplified.
Merge pull request #877 from imikay/patch-1

Update Resources/translations/validators.zh_CN.yml
Update Resources/translations/validators.pl.yml

deficiencies in the translation word mismatch in polish
Merge pull request #879 from lukasz86/patch-1

Update Resources/translations/validators.pl.yml
added Hungarian "bad credentials" translation