Merge remote-tracking branch 'willywongi/master' into dev

bower.json

@@ -3,7 +3,7 @@
 	"version": "0.0.67",
 	"homepage": "http://threejs.org/",
 	"description": "JavaScript 3D library",
-	"main": "build/three.js",
+	"main": "build/three.min.js",
 	"keywords": [
 		"three",
 		"threejs",