Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

examples/neo4j.html

@@ -134,7 +134,7 @@ <h1>Cypher Runner for New Remoting</h1>
     var authToken = neo4j.v1.auth.basic("neo4j", "neo4j");
     console.log(authToken);
     var driver = neo4j.v1.driver("bolt://localhost", authToken, {
-        encrypted:true
+        encrypted:false
     });
     var session = driver.session();