Merge branch 'jsonloader-callbacks' of https://github.com/zazabe/three.js into dev

src/loaders/JSONLoader.js

@@ -77,7 +77,7 @@ THREE.JSONLoader.prototype = {
 			var object = scope.parse( json, texturePath );
 			onLoad( object.geometry, object.materials );
 
-		} );
+		}, onProgress, onError );
 
 	},