Merge branch 'master' of rcs:/home/git/robocup-speechrec

.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SpeechRec</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

ps-grammar/dictionary/tobiDic.dic

@@ -120484,6 +120484,7 @@ timmins	T IH M IH N Z
 timmons	T IH M AH N Z
 timms	T IH M Z
 timmy	T IH M IY
+timo	T IH M AH
 timon	T AY M AH N
 timoney	T IH M AH N IY
 timor	T IY M AO R

ps-grammar/openChallenge/openChallenge.jsgf

+#JSGF V1.0;
+grammar ToBI_demoChallange;
+public <statement> = [tobi] [please] <command> [please] [tobi];
+
+<command> = <followMe> | <stop> | <cleanUp> | <grasp>;
+<followMe> = follow me;
+<stop> = stop [it];
+<cleanUp> = clean [up];
+<grasp> = grasp [object];

ps-grammar/robotZoo/roboZoo.jsgf

 #JSGF V1.0;
 grammar ToBI_roboZoo;
 
-public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> ) [tobi];
+public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> | <timo> ) [tobi];
 
 <biron> =  biron;
 <andi> = andreas; 
@@ -14,3 +14,4 @@ public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <chr
 <suchit> = suchit;
 <niksa> = niksa;
 <sven> = sven;
+<timo> = timo;

ps-grammar/rsm/rsm.jsgf

+#JSGF V1.0;
+grammar A4_rsm;
+public <rsm> = [the] <furniture> [is] [on] [the] [in] ( <IN_FRONT_OF> | <BEHIND> | <RIGHT_OF> | <LEFT_OF> ) [of] [the] <furniture>;
+
+<furniture> = ( ( sofa | couch ) | chair | cupboard | shelf | table ) ;
+<IN_FRONT_OF> = ( before | front );
+<BEHIND> = ( behind | after );
+<LEFT_OF> = ( left );
+<RIGHT_OF> = ( right );