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