(local changes)
(local changes)
Merge branch 'master' of github.com:quangounet/TOPP

Conflicts:
	tests/torques_pendulum_legacy.py