Merge branch 'dev' of https://github.com/mrdoob/three.js into dev

docs/api/en/extras/curves/CatmullRomCurve3.html

@@ -66,7 +66,7 @@
 		<p>Possible values are *centripetal*, *chordal* and *catmullrom*.</p>
 
 		<h3>[property:float tension]</h3>
-		<p>When [page:.type] is *catmullrom*, defines catmullrom's tension.</p>
+		<p>When [page:.curveType] is *catmullrom*, defines catmullrom's tension.</p>
 
 
 		<h2>Methods</h2>