Fixes related to #395
Fixes for #383
Changes related to organized import
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk

Conflicts:
	kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassQuery.java