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

docs/api/materials/Material.html

@@ -150,7 +150,7 @@
 		This disposes the material.
 		</div>
 
-		<h3>.setValues([page:object values]) [page:todo]</h3>
+		<h3>.setValues([page:object values])</h3>
 		<div>
 		values -- a container with parameters.
 		</div>