Merge branch 'master' into dev

examples/webgl_loader_sea3d_hierarchy.html

@@ -44,7 +44,7 @@
 		<script src="js/shaders/VignetteShader.js"></script>
 
 		<script src="js/MorphAnimMesh.js"></script>
-		<script src="js/loaders/collada/animation.js"></script>
+		<script src="js/loaders/collada/Animation.js"></script>
 
 		<script src="js/loaders/sea3d/SEA3D.js"></script>
 		<script src="js/loaders/sea3d/SEA3DLZMA.js"></script>

examples/webgl_loader_sea3d_keyframe.html

@@ -45,7 +45,7 @@
 		<script src="js/shaders/VignetteShader.js"></script>
 
 		<script src="js/MorphAnimMesh.js"></script>
-		<script src="js/loaders/collada/animation.js"></script>
+		<script src="js/loaders/collada/Animation.js"></script>
 
 		<script src="js/loaders/sea3d/SEA3D.js"></script>
 		<script src="js/loaders/sea3d/SEA3DLZMA.js"></script>

examples/webgl_loader_sea3d_morph.html

@@ -44,7 +44,7 @@
 		<script src="js/shaders/VignetteShader.js"></script>
 
 		<script src="js/MorphAnimMesh.js"></script>
-		<script src="js/loaders/collada/animation.js"></script>
+		<script src="js/loaders/collada/Animation.js"></script>
 
 		<script src="js/loaders/sea3d/SEA3D.js"></script>
 		<script src="js/loaders/sea3d/SEA3DLZMA.js"></script>

examples/webgl_loader_sea3d_skinning.html

@@ -34,9 +34,6 @@
 		</div>
 
 		<script src="../build/three.min.js"></script>
-		<script src="js/loaders/collada/Animation.js"></script>
-		<script src="js/loaders/collada/AnimationHandler.js"></script>
-		<script src="js/loaders/collada/KeyFrameAnimation.js"></script>
 
 		<script src="js/controls/OrbitControls.js"></script>
 
@@ -49,6 +46,9 @@
 		<script src="js/shaders/VignetteShader.js"></script>
 
 		<script src="js/MorphAnimMesh.js"></script>
+		<script src="js/loaders/collada/Animation.js"></script>
+		<script src="js/loaders/collada/AnimationHandler.js"></script>
+		<script src="js/loaders/collada/KeyFrameAnimation.js"></script>
 
 		<script src="js/loaders/sea3d/SEA3D.js"></script>
 		<script src="js/loaders/sea3d/SEA3DLZMA.js"></script>

examples/webgl_loader_sea3d_sound.html

@@ -93,7 +93,7 @@
 		<script src="js/shaders/VignetteShader.js"></script>
 
 		<script src="js/MorphAnimMesh.js"></script>
-		<script src="js/loaders/collada/animation.js"></script>
+		<script src="js/loaders/collada/Animation.js"></script>
 
 		<script src="js/loaders/sea3d/SEA3D.js"></script>
 		<script src="js/loaders/sea3d/SEA3DLZMA.js"></script>