Committing changes.
Merge branch 'master' of https://github.com/Chronotron/chaos-beast

Conflicts:
	Password Validator/test/password/validator/PasswordValidatorTest.java