fixed objectProp cases in grammar

psGrammar/tasks/gpsr/gpsr23.jsgf

@@ -59,7 +59,7 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <bringMeObj>    		= <V_bring> <NP_me> (<NP_object> | <NP_category>);
 <bringMeObjFromPlcmt> 		= <V_bring> <NP_me> (<NP_object> | <NP_absobject>) <fromLocPrep> <NP_placement>;
 <bringMeRelObjFromPlcmt>    = <V_bring> <NP_me> <NP_relObject> <NP_object> <fromLocPrep> <NP_placement>;
-<bringMeShapedObjFromPlcmt> = <V_bring> <NP_me> <NP_shapeObjectCat> <fromLocPrep> <NP_placement>;
+<bringMeShapedObjFromPlcmt> = <V_bring> <NP_me> <NP_objectprop> (object | <NP_category>) <fromLocPrep> <NP_placement>;
 
 
 <countObjOnPlcmt> 		= <V_count> (<NP_object> | <NP_category>) there are <placePrep> <NP_placement>;
@@ -105,7 +105,6 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <arePrep> 			= are;
 <absPrep>           = (at the (left | right) of) | ((left | right) most);
 <relPrep>           = (at the (left | right)) of | (above | behind | under | (on top of));
-<shape>             = biggest | largest | smallest | heaviest | lightest | thinnest;
 
 <V_take>    			= bring | take | get | grasp | (pick up);
 <V_place>   			= put | place;