Refactored resolution of Comparator code, need to implement OSGi resolution now.
Merge branch 'master' into Navajo_issue_118
Merge branch 'master' into Navajo_issue_118
Added infrastructure for service / DS based message sorters. (Issue
#118)

Still need to implement it for sportlink libraries.
clean build
fix m2e error (by ignoring it)
Merge branch 'master' of github.com:Dexels/navajo
Merge branch 'Navajo_issue_118'