Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/grammar/restaurant/restaurant.jsgf

@@ -6,10 +6,10 @@ public <restaurant> = [tobi] [please] <command> [please] [tobi];
 <follow> = (follow me) | (come [(with me) | here]) | (keep up);
 <stop> = stop [this];
 <beverages> = <objectCategory> | <objects>;
-<objectCategory> = drink | food;
-<objects> = <drink> | <food>;
+<objectCategory> = drinks | food;
+<objects> = <drinks> | <food>;
 
-<drink> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | apple_juice | milk;
+<drinks> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | apple_juice | milk;
 <food> = tomato_sauce | peanut_butter | chicken_noodles | marmalade | veggie_noodles | garlic_sauce | chocolate | cookies | drops | cracker;
 
 <ordering> = ordering;