Add Or IMatrixPredicate
Fix combination unit test
Merge branch 'develop' of https://github.com/gitools/gitools into feature/groups

Conflicts:
	org.gitools.matrix/src/main/java/org/gitools/matrix/filter/MatrixPredicates.java