Merge pull request #227 from fvalenza/devel

CMakeLists.txt

benchmark/timings-geometry.cpp

benchmark/timings.cpp

python/bindings_geometry_object.py

src/CMakeLists.txt

src/algorithm/collisions.hpp

src/multibody/geometry.hpp

src/multibody/geometry.hxx

src/multibody/parser/from-collada-to-fcl.hpp

src/multibody/parser/urdf-with-geometry.hpp

src/multibody/parser/urdf-with-geometry.hxx

src/multibody/parser/urdf.hxx

src/parsers/lua.cpp

src/parsers/lua.hpp

src/parsers/lua/lua_tables.cpp

src/parsers/lua/lua_tables.hpp

src/parsers/python.cpp

src/parsers/python.hpp

src/parsers/sample-models.cpp

src/parsers/sample-models.hpp