Changes for Nao iteration
Merge remote-tracking branch 'origin/nao_iteration' into nao_robot_iteration

Conflicts:
	hri_framework/src/hri_framework/gesture_action_srv.py