Extend sim detection in nao_diagnostic_updater.py
Merge remote-tracking branch 'upstream/devel' into devel
Support for predefined postures via actionlib
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