Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/grammar/room/room.jsgf~

pocketsphinxAdapter/nbproject/configurations.xml

pocketsphinxAdapter/nbproject/private/Default.properties

pocketsphinxAdapter/nbproject/private/configurations.xml

pocketsphinxAdapter/nbproject/project.xml

pocketsphinxAdapter/src/AlsaMicGrabber.cpp

pocketsphinxAdapter/src/AlsaMicGrabber.h

pocketsphinxAdapter/src/CMakeLists.txt

pocketsphinxAdapter/src/JsgfParser.cpp

pocketsphinxAdapter/src/JsgfParser.h

pocketsphinxAdapter/src/JsgfParserTest.cpp

pocketsphinxAdapter/src/PocketSphinxInitException.h

pocketsphinxAdapter/src/PocketSphinxWidget.cpp

pocketsphinxAdapter/src/PocketSphinxWidget.h

pocketsphinxAdapter/src/PocketSphinxWrapper.cpp

pocketsphinxAdapter/src/PocketSphinxWrapper.h

pocketsphinxAdapter/src/PocketsphinxAdapter.cpp

pocketsphinxAdapter/src/PocketsphinxAdapter.h

pocketsphinxAdapter/src/SimpleDoubleThresholdSegmenter.cpp

pocketsphinxAdapter/src/SimpleDoubleThresholdSegmenter.h