#36: adding mapping for reset
#37: refactoring matching algorithm
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop

Conflicts:
	grails-app/domain/co/okmercury/Answer.groovy
	grails-app/services/co/okmercury/MatchService.groovy