Merge branch 'convert_eigen_tf'

Conflicts:
	trajectory_evaluation/src/collision_detection.cpp
Merge branch 'master' of https://github.com/sterlingm/ramp

Conflicts:
	trajectory_evaluation/src/collision_detection.cpp