merged 'shape' and 'objectprop', fixed nesting in serve drinks

psGrammar/tasks/gpsr/gpsr23.jsgf

@@ -82,7 +82,7 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <guideNameFromBeacToBeac> 	= <V_guide> <NP_name> <fromLocPrep> <NP_beacon> <toLocPrep> <NP_beaconTwo>;
 <guideNameToBeacFindAtBeac> 	= <V_guide> <NP_name> <toLocPrep> <NP_beaconTwo> you (may | can | will) find (them | him | her) <atLocPrep> <NP_beacon>;
 
-<serveDrinks>			= <V_serve> <NP_partyfood> to (((everyone | everybody) | (all the <NP_agegenderpersonplural>)) | <NP_gestperson> in <NP_room>);
+<serveDrinks>			= <V_serve> <NP_partyfood> to ((((everyone | everybody) | (all the <NP_agegenderpersonplural>)) | <NP_gestperson>) in <NP_room>);
 <introduce>			= <V_introduce> <NP_personalpron> to ((((everyone | everybody) | (all the <NP_agegenderpersonplural>)) <LocPrep> <NP_room>) | (<NP_name> <LocPrep> <NP_beacon>));
 <requestleave>			= <V_ask> <NP_personalpron> to <V_leave>;
 <guidePrsToTaxi> 		= <V_guide> <NP_personalpron> <toLocPrep> [<NP_personalpron>] <NP_taxi>;
@@ -130,7 +130,6 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <NP_object>    		= (the <N_object>) | (a <N_object>) | (an <N_object>) | (<N_object>);
 <NP_absobject>      = (the <absPrep> object);
 <NP_relObject>      = (the object <relPrep>);
-<NP_shapeObjectCat>    = (the <shape> (object | <N_category>));
 <NP_objectpron> 		= (<N_objectpron>);
 <NP_category> 			= (the <N_category>) | <N_category>;
 <NP_objectprop> 		= (the [<N_three>] <N_objectprop>);