Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/config/cocktailparty/cocktailparty.conf~

pocketsphinxAdapter/config/followMe/followMe.conf~

pocketsphinxAdapter/config/gprs/gprs.conf~

pocketsphinxAdapter/config/inspection/inspection.conf~

...inxAdapter/config/inspectionRobot1/inspectionRobot1.conf~

...inxAdapter/config/inspectionRobot2/inspectionRobot2.conf~

pocketsphinxAdapter/config/install_pocketsphinx_conf.sh~

pocketsphinxAdapter/grammar/bironLeave/bironLeave.jsgf~

pocketsphinxAdapter/grammar/cleanUp/cleanUp.jsgf~

pocketsphinxAdapter/grammar/confirm/confirm.jsgf~

pocketsphinxAdapter/grammar/followMe/followMe.jsgf~

pocketsphinxAdapter/grammar/gprs/gprs.jsgf~

pocketsphinxAdapter/grammar/gprsPerson/gprsPerson.jsgf~

pocketsphinxAdapter/grammar/leave/leave.jsgf~

pocketsphinxAdapter/grammar/location/location.jsgf~

pocketsphinxAdapter/grammar/object/object.jsgf~

pocketsphinxAdapter/grammar/person/person.jsgf~

pocketsphinxAdapter/grammar/room/room.jsgf~

pocketsphinxAdapter/nbproject/configurations.xml

pocketsphinxAdapter/src/PocketSphinxWidget.cpp