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

ps-config/jgerlach_challenge/jgerlach_challenge.conf

+[main]
+startdb=47;
+uttdb=52;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=jgerlach_challenge;
+hmm=../../../pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../psGrammar/jgerlach_challenge/jgerlach_challenge.jsgf;
+rsbscope=/speechrec/psa/jgerlach_challenge;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+hmm=../../../pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=../../psGrammar/dictionary/tobiDic.dic;
+jsgf=../../psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;

ps-grammar/jgerlach_challenge/jgerlach_challenge.jsgf

+#JSGF V1.0;
+grammar jgerlach_challenge;
+public <roomNT> = (<kitchenNT> | <livingRoomNT>);
+<kitchenNT> =  [clean up the] kitchen;
+<livingRoomNT> = [clean up the] living room;