Merge branch 'patch-6' of https://github.com/brason/three.js into dev

Conflicts:
	src/core/BufferGeometry.js

src/core/BufferGeometry.js

@@ -474,7 +474,7 @@ THREE.BufferGeometry.prototype = {
 		if ( geometry.colors.length > 0 ) {
 
 			var colors = new Float32Array( geometry.colors.length * 3 );
-			this.addAttribute( 'color', new THREE.BufferAttribute( colors, 3 ).copyVector3sArray( geometry.colors ) );
+			this.addAttribute( 'color', new THREE.BufferAttribute( colors, 3 ).copyColorsArray( geometry.colors ) );
 
 		}