updated to spark 1.2
Merge branch 'feature/neo4j' into develop