Merge pull request #112 from jcarpent/devel

CMakeLists.txt

src/multibody/geometry.hpp

src/multibody/geometry.hxx

src/multibody/parser/sample-models.cpp

src/multibody/parser/srdf.hpp

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

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

src/python/geometry-model.hpp

src/python/parsers.hpp

unittest/geom.cpp