Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Updating Move head in manipulation_states
Updating activate_asr.py: the sleeper is removed because the previous function of activating the ASR is blocking, so it is useless to sleep for a certain amount of time
Updating timeout for preemptions
Updating search faces for better interaction
Updating what_say_sm to be able to approach to the person using xtion
Merge pull request #251 from reem-utils/chang_branch

Chang branch