Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/robocup-speechrec

ps-config/exercise/climberg.conf

+[main]
+startdb=43;
+uttdb=47;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=hc;
+hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/homecoming/hc.jsgf;
+rsbscope=/speechrec/psa/homecoming;
+bestpath=no;
+autoload=yes;

ps-config/kgardeja/kgardeja.conf

@@ -73,6 +73,6 @@ name=kgardeja;
 hmm=../../../pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
 dict=../../psGrammar/dictionary/tobiDic.dic;
 jsgf=../../psGrammar/kgardeja/kgardeja.jsgf;
-rsbscope=/speechrec/psa/controlExecution;
+rsbscope=/speechrec/psa/kgardeja;
 bestpath=no;
 autoload=yes;

ps-grammar/exercise/climberg.jsgf

+#JSGF V1.0;
+grammar climberg;
+public <statement> = ( <kitchen> | <livingroom>);
+
+<kitchen> = kitchen;
+<livingroom> = livingroom;
+

ps-grammar/kgardeja/kgardeja.jsgf

 #JSGF V1.0;
 grammar kgardeja;
-public <statement> = <kitchen> | <livingroom> | <accept>;
+public <statement> = <kitchen> | <livingroom> | <accept> | <cleankitchen> | <cleanlivingroom> | <decline>;
 <kitchen> = kitchen;
 <livingroom> = livingroom;
 <accept> = yes;
+<cleankitchen> = clean kitchen;
+<cleanlivingroom> = clean livingroom;
+<decline> = no;