Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/grammar/restaurant/restaurant.jsgf

 #JSGF V1.0;
 grammar ToBI_restaurant;
 public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <follow> | <stop> | <beverages> | <ordering> | <deliveryLocations> | <safePlaceLeft> | <safePlaceRight> | <safePlace>;
+<command> = <follow> | <stop> | <beverages> | <ordering> | <deliveryLocations> | <savePlaceLeft> | <savePlaceRight> | <savePlace>;
 
 <follow> = (follow me) | (come [(with me) | here]) | (keep up);
 <stop> = stop [this];
@@ -14,7 +14,7 @@ public <restaurant> = [tobi] [please] <command> [please] [tobi];
 
 <ordering> = ordering;
 <deliveryLocations> = table (one | two | three);
-<safePlaceLeft> = <safe> left;
-<safePlaceRight> = <safe> right;
-<safePlace> = <safe>;
-<safe> = safe [the] (place | location) [to | on] [the | my];
+<savePlaceLeft> = <save> left;
+<savePlaceRight> = <save> right;
+<savePlace> = <save>;
+<save> = save [the] (place | location) [to | on] [the | my];