Merge remote-tracking branch 'stonneau/devel' into affMerge

CMakeLists.txt

data/meshes/plane.mtl

data/meshes/plane.obj

data/srdf/plane.srdf

data/urdf/plane.urdf

idl/hpp/corbaserver/rbprm/rbprmbuilder.idl

script/scenarios/darpa_hyq_interp.py

script/scenarios/darpa_hyq_path.py

script/scenarios/ground_crouch_hyq_interp.py

script/scenarios/ground_crouch_hyq_path.py

script/scenarios/olivier_urdf.py

script/scenarios/stair_bauzil_hrp2_interp.py

script/tools/matlab/effectorRomToObj.m

script/tools/matlab/vertface2obj.m

src/CMakeLists.txt

src/hpp/corbaserver/rbprm/rbprmfullbody.py

src/hpp/corbaserver/rbprm/tools/__init__.py

src/hpp/corbaserver/rbprm/tools/generateROMs.py

src/hpp/corbaserver/rbprm/tools/plot_analytics.py

.../corbaserver/rbprm/tools/plot_analytics.py.BACKUP.4492.py