Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Update Check dependences
Update of listen operator in restaurant. Now it uses tags
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Added my restaurantGuide.gram
Merge branch 'cris_branch'
Update of cocktail party. Added wave detection and debug messages
Merge pull request #220 from reem-utils/chang_branch

Chang branch
Change in enter_room. It waits 5 secs between each sentence
Merge pull request #221 from reem-utils/cris_branch

Change in enter_room. It waits 5 secs between each sentence
Now testing in robot with paramaters given by our coach. Added a new verb to make robot guide people. Bring to not working, again, to check possible colisions between guide and bring to
Merge branch 'master' of http://github.com/reem-utils/robocup2014 into fix_sergi

Conflicts:
	basic_states/speech_states/src/speech_states/asr_topic_reader.py
solved a conflictive files isue
Merge pull request #222 from reem-utils/fix_sergi

Fix sergi
Improved drinks grammar
Got rid of sure word
Improved the grammars in empirical tests
Update of cocktail party. It recognize wave and faces
Merge pull request #223 from reem-utils/cris_branch

Update of cocktail party. It recognize wave and faces
Updating grasp_time_out