added search criterias to match filter
corrected java version inside pom file
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/com/glo4003/project/MatchController.java
	src/main/java/helper/MatchFilterV2.java
	src/main/java/test/unit/helper/UserConverterTest.java
correct a little bug