New function for matching with different filters and basic filters. Notice that new function is called checkForMatchObj and not checkForMatch.
no message
no message
Merge branch 'master' of https://github.com/Brkk/text-share into dev

Conflicts:
	src/main/java/com/uvic/textshare/service/matching/MatchingFunction.java