Merge GPSR changes

We set up the new grammar 'gpsr23.jsgf' which encompasses all -and only- possible command generator statements. Along with it comes the unfinished 'gpsr23generic.jsgf' grammar, which restricts commands to their required references. It might be worth to fully implement that one, but for the Robocup the former has been set as the active grammar.

psConfig/tasks/gpsr/gpsr.conf

@@ -9,7 +9,7 @@ alsadevice=sysdefault;
 [pocketsphinxinstance]
 name=Commands;
 dict=../../../psGrammar/dictionary/tobiDic.dic;
-jsgf=../../../psGrammar/tasks/gpsr/gpsr23alternate.jsgf;
+jsgf=../../../psGrammar/tasks/gpsr/gpsr23.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;
 autoload=yes;