Fixed a bug where the query builder would only accept list of Integers instead of other objects (ie Strings)
Merge branch 'master' into devel

Conflicts:
	pom.xml