Merge branch 'master' into dev

examples/webgl_tonemapping.html

@@ -33,13 +33,11 @@
 
 		<script src="../build/three.js"></script>
 		<script src="../examples/js/controls/OrbitControls.js"></script>
-		<script src="../src/loaders/BinaryTextureLoader.js"></script>
 
 		<script src="../examples/js/Detector.js"></script>
 		<script src="../examples/js/libs/stats.min.js"></script>
 
 		<script src="../examples/js/libs/dat.gui.min.js"></script>
-		<script src="../src/loaders/BinaryTextureLoader.js"></script>
 		<script src="../examples/js/loaders/RGBELoader.js"></script>
 		<script src="../examples/js/loaders/HDRCubeTextureLoader.js"></script>
 		<script src="../examples/js/Half.js"></script>
@@ -52,9 +50,6 @@
 		<script src="../examples/js/postprocessing/MaskPass.js"></script>
 		<script src="../examples/js/postprocessing/ShaderPass.js"></script>
 		<script src="../examples/js/shaders/CopyShader.js"></script>
-		<script src="../examples/js/shaders/FXAAShader.js"></script>
-		<script src="../examples/js/postprocessing/BloomPass.js"></script>
-		<script src="../examples/js/shaders/ConvolutionShader.js"></script>
 
 		<script>