Merge pull request #156 from fvalenza/devel

.travis.yml

CMakeLists.txt

src/algorithm/collisions.hpp

src/multibody/geometry.hpp

src/multibody/geometry.hxx

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

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

src/python/geometry-data.hpp

src/python/geometry-model.hpp

src/python/geometry-object.hpp

src/python/python.cpp

unittest/geom.cpp