upgraded to Neo4j 2.0.4
Merge remote-tracking branch 'origin/master'