Fixed map and dictionary's not working
Added missing files
Merge branch 'avro-975' into trunk