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

docs/api/materials/ParticleSystemMaterial.html

@@ -22,7 +22,7 @@
 		
 		<div>
 		color — Particle color in hexadecimal. Default is 0xffffff.<br />
-		map — a [page:Texture texture]. Default is null. // TODO: specify what is its purpose<br />
+		map — a [page:Texture texture].If defined, then a point has the data from texture as colors. Default is null.<br />
 		size — Define size of particles. Default is 1.0.<br />
 		sizeAttenuation — Enable/disable size attenuation with distance.<br />
 		vertexColors — Define whether the material uses vertex colors, or not. Default is false.<br />
@@ -37,7 +37,7 @@
 		
 		<h3>.[page:Texture map]</h3>
 		
-		<div>Sets the color of the particles using data from a texture (?).</div>
+		<div>Sets the color of the particles using data from a texture.</div>
 		
 		<h3>.[page:Number size]</h3>