fix vdb avro link
Fixed bug that caused class cast exception
Merge branch 'master' into elie
Merge remote-tracking branch 'origin/elie' into cross-device
Fixed project.properties