beacon update

psGrammar/tasks/eegpsr/commands_cat2.jsgf

@@ -149,8 +149,8 @@ public <sentence> = [could you | robot | tobi] [please] <VP>;
 
 
 <N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christpher | william | john | david | james | robert | scott | richard;
-<N_location> 			    = (couch table) | bed | (kitchen cabinet) | bar | (dining table);
-<N_locationtwo> 		    = (couch table) | bed | (kitchen cabinet) | bar | (dining table);
+<N_location> 			    = (couch table) | bed | bar | (dining table);
+<N_locationtwo> 		    = (couch table) | bed | bar | (dining table);
 <N_room> 		    	    = bedroom | (dining room) | kitchen | (living room);
 <N_roomtwo> 			    = bedroom | (dining room) | kitchen | (living room);
 <N_object> = shower gel | soap | toothpaste | sponge | wiper | box | tray | cacao | coke | malz | mixdrink | (orange juice) | (peppermint tea) | water | cookies | (fruit bar) | kinder | nuts  | apple | (green paprika) | kiwi | lemon | noodles | pepper | salt | (tomato [paste]);

psGrammar/tasks/gpsr/commands.jsgf

@@ -91,8 +91,8 @@ public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2
 <N_room> = bedroom | (dining room) | kitchen | (living room);
 <N_placement> = (tv table) | cupboard | (couch table) | desk | bookcase | (bedside table) | (kitchen table) | (kitchen cabinet) | bar | (dining table) | cabinet | (display case) | storage shelf;
 <N_placementTwo> = (tv table) | cupboard | (couch table) | desk | bookcase | (bedside table) | (kitchen table) | (kitchen cabinet) | bar | (dining table) | cabinet | (display case) | storage shelf;
-<N_beacon> = (couch table) | bed | (kitchen cabinet) | bar | (dining table);
-<N_beaconTwo> = (couch table) | bed | (kitchen cabinet) | bar | (dining table);
+<N_beacon> = (couch table) | bed | bar | (dining table);
+<N_beaconTwo> = (couch table) | bed | bar | (dining table);
 <N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christpher | william | john | david | james | robert | scott | richard;
 <N_objectpron> = it;
 <N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest;