Merge branch 'master' into dev

examples/webvr_vive.html

@@ -175,8 +175,15 @@
 				controller2.standingMatrix = controls.getStandingMatrix();
 				scene.add( controller2 );
 
+				var vivePath = 'models/obj/vive-controller/';
 				var loader = new THREE.OBJLoader();
-				loader.load( 'models/obj/vr_controller_vive_1_5.obj', function ( object ) {
+				loader.load( vivePath + 'vr_controller_vive_1_5.obj', function ( object ) {
+
+					var loader = new THREE.TextureLoader();
+
+					var controller = object.children[0];
+					controller.material.map = loader.load( vivePath + 'onepointfive_texture.png' );
+					controller.material.specularMap = loader.load( vivePath + 'onepointfive_spec.png' );
 
 					controller1.add( object.clone() );
 					controller2.add( object.clone() );