modified:   hrl_lib/quaternion.py
Merge branch 'master' of https://github.com/gt-ros-pkg/hrl-lib

Conflicts:
	hrl_lib/src/hrl_lib/quaternion.py