Merge branch 'master' into nested-query

Conflicts:
	pom.xml
	src/main/java/org/objectquery/ObjectQuery.java
	src/main/java/org/objectquery/generic/ConditionType.java
	src/main/java/org/objectquery/generic/QueryConditionImpl.java
	src/test/java/org/objectquery/generic/TestQueryCondition.java