mazbe not important
Merge branch 'master1' of https://github.com/johannesE/multimodal_interfaces into master1

Conflicts:
	SuperBall/SuperBall/SpeechBasics.cpp
	SuperBall/SuperBall/SuperBall.cpp