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

ps-config/basicFunctionalities/basicFunctionalities.conf

ps-config/basicFunctionalities/basicFunctionalities.conf~

ps-config/cleanUp/cleanUp.conf

ps-config/cocktailparty/cocktailparty.conf

ps-config/demo/demoCentralLab.conf

ps-config/demoChallange/demoChallange.conf

ps-config/demoChallenge/demoChallenge.conf

ps-config/emergencySituation/emergencySituation.conf

ps-config/fireInTheApartment/fireInTheApartment.conf

ps-config/followMe/followMe.conf

ps-config/gprs/gprs.conf

ps-config/inspection/inspection.conf

ps-config/inspectionRobot1/inspectionRobot1.conf

ps-config/inspectionRobot2/inspectionRobot2.conf

ps-config/install_pocketsphinx_conf.sh

ps-config/openChallange/openChallange.conf

ps-config/openChallenge/openChallenge.conf

ps-config/restaurant/restaurant.conf

ps-config/robotZoo/roboZoo.conf

ps-grammar/basicFunctionalities/basicFunctionalities.jsgf