Finalize ability matching
Merge branch 'master' of https://github.com/Baggerboot/Matcher

Conflicts:
	Matcher/Matcher/DatabaseInterface.cs