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

docs/api/materials/MeshNormalMaterial.html

@@ -17,7 +17,7 @@
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo parameters])</h3>
+		<h3>[name]([page:Object parameters])</h3>
 		<div>
 		parameters is an object with one or more properties defining the material's appearance. 
 		</div>