Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/grammar/location/location.jsgf

@@ -6,7 +6,7 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<location> = (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration | everywhere | somewhere | appartment);
+<location> = (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration | everywhere | somewhere | apartment);
 <appliance_class> = fridge | sink | tv;
 <shelf_class> = hanger | shelf;
 <seat_class> = couch | lounge | bed | armchair;