Merge branch 'master' of rcs:/home/biron/git/robocup-speechrec

ps-grammar/emergencySituation/object.jsgf

@@ -3,9 +3,9 @@ grammar emergencySituation_object;
 
 public <emergencySituation> = <objectPhrase>;
 
-<objectPhrase> = <water> | <firstaidkit> | <cellphone> | <nothing>;
+<objectPhrase> = <water> | <biscuits> | <cellphone>;
 
 <water> = water;
-<firstaidkit> = first aid kit;
+<biscuits> = biscuits;
 <cellphone> = cell phone;
 <nothing> = nothing;

ps-grammar/sfb/review.jsgf

@@ -11,4 +11,4 @@ public <review> = [tobi] [please] (<follow> | <observe> | <teach> | <locate> | <
 <locate> = ( ( where is [a | an | the] ) | ( where are [the] ) ) ( <object> | <furniture> );
 <list> = ( which objects do you know ) | ( list [the] objects );
 <furniture> = [other] ( shelf | cupboard | table | chair | armchair | sofa | stool | dresser | closet );
-<object> = [other] ( pringles | apple | milk | biscuits | book  );
+<object> = [other] ( pringles | coffee | crackers | biscuits | milk  );