Upgraded to a stable neo4j version
Merge remote-tracking branch 'origin/master'