renamed "validator" to "validation" to avoid confusion between validation classes and custom validator classes
Merge remote-tracking branch 'origin/master'