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

travis-ci image fixed for branch 2.1.x
Updated Dutch translation
Merge pull request #907 from WouterJ/patch-1

Updated Dutch translation
Fixed parse error in JA translations
Swapped double quotes for singles in JA translation
Merge pull request #1064 from InvertedAcceleration/1.2.x

Fixed parse error in JA translations
add doc type
fixed typo "you new layout"
Merge pull request #1275 from baruica-forks/patch-1

fixed typo "you new layout"
Merge branch '1.2.x' into 1.3.x

Conflicts:
	Resources/translations/FOSUserBundle.ja.yml
	Resources/translations/FOSUserBundle.nl.yml
Added a max length validation on the password

This max length matches the max length accepted by the Symfony password
encoders as of Symfony 2.4.
Removed the custom message for the password max length

This message will probably never be displayed for real users so
maintaining a translation for it does not seem worth it. The default max
length message translated in Symfony itself can be used.
Added the max length validation when changing the password
Updated the changelog for 1.3.3
Merge branch '1.3.x'

Conflicts:
	Changelog.md
	README.markdown
	Resources/config/validation.xml
Added a max length on the password field
Updated the changelog for 1.2.5
Merge branch '1.2.x' into 1.3.x

Conflicts:
	Changelog.md
	Resources/config/validation.xml
Add missing commas in russian translation messages