Final fix for #382
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk

Conflicts:
	src/kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassQuery.java
Fix for #382