Selma's final version
Merge branch 'like' of github.com:intermine/intermine into like

Conflicts:
	intermine/web/main/src/org/intermine/webservice/server/recommendations/SimilarityService.java