Convert to java
Convert to java
Merge branch 'master' of https://github.com/mindflow/querybuilder.git

Conflicts:
	querybuilder/src/test/java/com/querybuilder/tests/QueryTest.java