Conflicts:
	src/ZMPRefTrajectoryGeneration/ZMPVelocityReferencedSQP.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.cpp
	src/ZMPRefTrajectoryGeneration/nmpc_generator.hh
	tests/CMakeLists.txt
	tests/TestNaveau2015.cpp

Conflicts:
	src/RobotDynamics/pinocchiorobot.cpp

Generate trajectories put as a method of TestObject.cpp

Conflicts:
	tests/CMakeLists.txt

Fix pb with unitary tests.

Fix pb with unitary tests.