Adding service for toggling the arm motion while walking
Merge pull request #20 from ahornung/devel

Adding service for toggling the arm motion while walking
Extend sim detection in nao_diagnostic_updater.py
Added support for changing speech recognition vocabulary via actionlib. Updates the dynamic reconfigure variable as well.
Added actionlib interface for speech with feedback
Merge remote-tracking branch 'upstream/devel' into devel
Double inheritance from NaoNode and ALModule implemented
Support for predefined postures via actionlib
SpeechWithFeedback.action refined. Erased unneccessary bool flags.
Merge pull request #23 from etsardou/devel

actionlib for speech and altering speech recognition vocabulary (Closes #16)
Moved the predefined pose support from pose_manager to nao_controller. Action name changed as well
Added erroneous input checks. Altered the action server name.
Merge branch 'pose_manager_posture_enhancement' of https://github.com/etsardou/nao_robot into etsardou-pose_manager_posture_enhancement

Conflicts:
	nao_msgs/CMakeLists.txt
Merge branch 'etsardou-pose_manager_posture_enhancement' into devel
fix the missing dependency on xacro
Merge pull request #26 from vrabaud/fix_xacro

fix the missing dependency on xacro
Revert "Merge pull request #26 from vrabaud/fix_xacro"

Breaks groovy (xacro no catkin package), but will be required from hydro on

This reverts commit 321424a634a309ea9c284cf027074cdeda2a3c67, reversing
changes made to 383d285e01997e585bfa731525ce5f17a6cc3165.
Removed the Python camera driver

It has been moved to nao_camera since a few months
Fix xapparser __init__.py encoding, UTF used in header
run nao_diagnostic_updater by default