Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/config/restaurant/restaurant.conf

pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf

pocketsphinxAdapter/grammar/cocktailparty/object.jsgf

pocketsphinxAdapter/grammar/dictionary/tobiDic.dic

pocketsphinxAdapter/grammar/gprs/gprs.jsgf

pocketsphinxAdapter/grammar/gprsPerson/gprsPerson.jsgf

pocketsphinxAdapter/grammar/location/location.jsgf

pocketsphinxAdapter/grammar/object/object.jsgf

pocketsphinxAdapter/grammar/person/person.jsgf

pocketsphinxAdapter/grammar/restaurant/restaurant.jsgf

pocketsphinxAdapter/grammar/room/room.jsgf