[sot_pr2] Synchronize.
Merge branch 'catkin' into travis

Conflicts:
	sot_pr2