workaround for issue #256
Merge branch 'master' of github.com:marko-asplund/astyanax

Conflicts:
	astyanax-cassandra-api/api-classes.lst
	astyanax-cassandra-api/build.gradle