Merge branch 'dev' of https://github.com/Cy-Bo-Rg/three.js into dev

Conflicts:
	examples/index.html

examples/index.html

@@ -198,6 +198,7 @@
 				"webgl_effects_anaglyph",
 				"webgl_effects_parallaxbarrier",
 				"webgl_effects_stereo",
+				"webgl_exporter_obj",
 				"webgl_geometries",
 				"webgl_geometries2",
 				"webgl_geometry_colors",
@@ -217,6 +218,7 @@
 				"webgl_geometry_normals",
 				"webgl_geometry_nurbs",
 				"webgl_geometry_shapes",
+				"webgl_geometry_spline_editor",
 				"webgl_geometry_terrain",
 				"webgl_geometry_terrain_fog",
 				"webgl_geometry_terrain_raycast",
@@ -249,8 +251,8 @@
 				"webgl_loader_babylon",
 				"webgl_loader_collada",
 				"webgl_loader_collada_keyframe",
-				"webgl_loader_collada_skinning",
 				"webgl_loader_collada_kinematics",
+				"webgl_loader_collada_skinning",
 				"webgl_loader_ctm",
 				"webgl_loader_ctm_materials",
 				"webgl_loader_gltf",
@@ -266,7 +268,6 @@
 				"webgl_loader_utf8",
 				"webgl_loader_vrml",
 				"webgl_loader_vtk",
-				"webgl_exporter_obj",
 				"webgl_lod",
 				"webgl_marchingcubes",
 				"webgl_materials",
@@ -287,14 +288,15 @@
 				"webgl_materials_envmaps",
 				"webgl_materials_grass",
 				"webgl_materials_lightmap",
-				"webgl_materials_normalmap",
 				"webgl_materials_normaldisplacementmap",
+				"webgl_materials_normalmap",
 				"webgl_materials_parallaxmap",
 				"webgl_materials_shaders_fresnel",
 				"webgl_materials_skin",
 				"webgl_materials_texture_anisotropy",
 				"webgl_materials_texture_compressed",
 				"webgl_materials_texture_filters",
+				"webgl_materials_texture_hdr",
 				"webgl_materials_texture_manualmipmap",
 				"webgl_materials_texture_pvrtc",
 				"webgl_materials_texture_tga",
@@ -313,9 +315,9 @@
 				"webgl_multiple_canvases_complex",
 				"webgl_multiple_canvases_grid",
 				"webgl_multiple_elements",
-				"webgl_multiple_renderers",
 				"webgl_multiple_views",
 				"webgl_nearestneighbour",
+				"webgl_objects_update",
 				"webgl_octree",
 				"webgl_octree_raycasting",
 				"webgl_panorama_equirectangular",
@@ -330,11 +332,11 @@
 				"webgl_performance_static",
 				"webgl_postprocessing",
 				"webgl_postprocessing_advanced",
+				"webgl_postprocessing_crossfade",
 				"webgl_postprocessing_dof",
 				"webgl_postprocessing_dof2",
-				"webgl_postprocessing_godrays",
-				"webgl_postprocessing_crossfade",
 				"webgl_postprocessing_glitch",
+				"webgl_postprocessing_godrays",
 				"webgl_postprocessing_ssao",
 				"webgl_rtt",
 				"webgl_sandbox",
@@ -343,14 +345,15 @@
 				"webgl_shader2",
 				"webgl_shaders_ocean",
 				"webgl_shaders_ocean2",
-				"webgl_shading_physical",
 				"webgl_shaders_sky",
 				"webgl_shaders_tonemapping",
 				"webgl_shaders_vector",
+				"webgl_shading_physical",
 				"webgl_shadowmap",
 				"webgl_shadowmap_performance",
 				"webgl_shadowmap_viewer",
 				"webgl_shadowmesh",
+				"webgl_skinning_simple",
 				"webgl_sprites",
 				"webgl_terrain_dynamic",
 				"webgl_test_memory",
@@ -360,12 +363,12 @@
 			],
 			"webgl / advanced": [
 				"webgl_buffergeometry",
+				"webgl_buffergeometry_constructed_from_geometry",
 				"webgl_buffergeometry_custom_attributes_particles",
 				"webgl_buffergeometry_drawcalls",
-				"webgl_buffergeometry_constructed_from_geometry",
 				"webgl_buffergeometry_instancing",
-				"webgl_buffergeometry_instancing_dynamic",
 				"webgl_buffergeometry_instancing_billboards",
+				"webgl_buffergeometry_instancing_dynamic",
 				"webgl_buffergeometry_instancing_interleaved_dynamic",
 				"webgl_buffergeometry_lines",
 				"webgl_buffergeometry_lines_indexed",
@@ -390,6 +393,7 @@
 			"css3d": [
 				"css3d_molecules",
 				"css3d_panorama",
+				"css3d_panorama_deviceorientation",
 				"css3d_periodictable",
 				"css3d_sandbox",
 				"css3d_sprites",
@@ -406,9 +410,9 @@
 				"misc_controls_pointerlock",
 				"misc_controls_trackball",
 				"misc_controls_transform",
+				"misc_fps",
 				"misc_lights_test",
 				"misc_lookat",
-				"misc_fps",
 				"misc_sound",
 				"misc_ubiquity_test",
 				"misc_ubiquity_test2",
@@ -436,6 +440,7 @@
 				"canvas_lights_pointlights",
 				"canvas_lines",
 				"canvas_lines_colors",
+				"canvas_lines_colors_2d",
 				"canvas_lines_dashed",
 				"canvas_lines_sphere",
 				"canvas_materials",