Re #1580 Added the cc:License and changes from ticket #80 of the
Ingestion board
Fixed compilation issues after schema changes
Merge branch 'neo4j' into masterNeoMerge