Merge branch 'robocupchanges' of...

Merge branch 'robocupchanges' of gitlab.ub.uni-bielefeld.de:CLF/Robocup/robocup-speechrec into robocupchanges

psGrammar/tasks/restaurant/order_apartment.jsgf

@@ -22,4 +22,4 @@ public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [plea
     (banana) |
     (apple));
     
-<drinks> = ((red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (nesquik) );
+<drinks> = ((red wine) | (wine) | (juice pack) | (cola) | (coke) | (tropical juice) | (milk) | (iced tea) | (orange juice));