Fixing spock dependency
Adding gnerateUserMatches to MatchService
Merge branch 'develop' of github.com:Spantree/okmercury into develop