Out of date
Merge branch 'development' of https://github.com/JenkinsDev/Validatinator into development

Conflicts:
	js/tests/validatinator_validations_test.js