Control commit for pull
Merge branch 'master' of github.com:bishma-stornelli/querying-based-on-similarity

Conflicts:
	test/fuzzy/translator/GroupByTest.java
Merge branch 'master' of github.com:bishma-stornelli/querying-based-on-similarity