tags
Merge branch 'roger_branch' of https://github.com/reem-utils/robocup2014 into roger_branch
Bug fixing for timeout.py in util_states, it could not run in concurrence mode
Updating avoid_that_sm.py
Updating POIS for emergency
Updating POIS for Robot_inspection
Updating parameters for basic functionalities test
Updating questions for more simple what did you say
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Merge pull request #244 from reem-utils/chang_branch

Chang branch
Updating grammar for what did you say: error in tags
Updating Basic Functionalities and What did you say
Updating Robot Inspection -- Semi final versio
Adding a state for failure recovery in what_say: now if the person cannot be reached, then it does not abort
Merge pull request #245 from reem-utils/fix_sergi

Fix sergi
Updating Face Detection and Recognition for concurrence mode and Better Topic reader
Adding Face_topic_reader, it is similar to ASR_topic_reader
Merge pull request #246 from reem-utils/chang_branch

Chang branch
Updating pois for basic functionalities
Updating Basic Functionalities: pick and place; search_faces; what_say