Merge branch '1.0' into 1.1

Author: oskarhane

gulpfile.js

@@ -83,7 +83,9 @@ gulp.task('build-browser-test', function(){
   var testFiles = [];
   return gulp.src('./test/**/*.test.js')
     .pipe( through.obj( function( file, enc, cb ) {
-      testFiles.push( file.path );
+      if(file.path.indexOf('examples.test.js') < 0) {
+        testFiles.push( file.path );
+      }
       cb();
     }, function(cb) {
       // At end-of-stream, push the list of files to the next step

test/v1/record.test.js

@@ -18,7 +18,7 @@
  */
 
 var Record = require("../../lib/v1/record").Record;
-var Neo4jError = require("../../lib/v1/internal/error").Neo4jError;
+var Neo4jError = require("../../lib/v1/error").Neo4jError;
 
 
 describe('Record', function() {