Merge branch 'master' of https://github.com/padrig64/ValidationFramework

Conflicts:
	validationframework-core/src/main/java/com/github/validationframework/base/validator/AndSimpleValidator.java
	validationframework-core/src/main/java/com/github/validationframework/base/validator/AndValidator.java
	validationframework-core/src/main/java/com/github/validationframework/base/validator/OrSimpleValidator.java
	validationframework-core/src/main/java/com/github/validationframework/base/validator/OrValidator.java