Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Conflicts:
	babylon.1.13-beta-debug.js
	babylon.1.13-beta.js

Babylon/Tools/babylon.tools.ts

@@ -671,4 +671,4 @@ module BABYLON {
             }
         }
     }
-} 
+} 

Exporters/Blender/io_export_babylon.py

@@ -644,7 +644,7 @@ class Export_babylon(bpy.types.Operator, ExportHelper):
 
         # Export Physics
         if object.rigid_body != None:
-            shape_items = {'BOX': 1, 'SPHERE': 2}
+            shape_items = { 'SPHERE': 1, 'BOX': 2, 'MESH': 4, 'CAPSULE': 5, 'CONE': 6, 'CYLINDER': 7, 'CONVEX_HULL': 8}
             shape_type = shape_items[object.rigid_body.collision_shape]
             Export_babylon.write_int(file_handler, "physicsImpostor", shape_type)
             mass = object.rigid_body.mass

readme.md

@@ -1,16 +1,14 @@
 Babylon.js
 ==========
 
+Getting started? Play directly with the Babylon.js API via our [playground](http://www.babylonjs.com/playground). It contains also lot of simple samples to learn how to use it. 
+
 Official web site: [www.babylonjs.com](http://www.babylonjs.com/) 
 
 Official [forum](http://www.html5gamedevs.com/forum/16-babylonjs/) on www.html5gamedevs.com
 
-Online [assets converter](http://www.babylonjs.com/converter.html) for .FBX, .DAE, .OBJ and .MXB
-
 Online [sandbox](http://www.babylonjs.com/sandbox) where you can test your .babylon scenes with a simple drag'n'drop
 
-Online [playground](http://www.babylonjs.com/playground) where you can interactively learn how to use babylon.js
-
 Online [shader creation tool](http://www.babylonjs.com/cyos/) where you can learn how to create GLSL shaders
 
 ## Documentation
@@ -83,7 +81,7 @@ Online [shader creation tool](http://www.babylonjs.com/cyos/) where you can lear
  - Height maps
  - Constructive solid geometries
 -  Import: 
- - Babylon scene file can be converted from .OBJ, .FBX, .MXB
+ - Babylon scene file can be converted from .OBJ, .FBX
  - Exporter for Blender
  - Exporter for Cheetah3d
  - Exporter for 3ds Max