sorry about this commit, there is no way around.
Merge branch 'master' of https://github.com/johannesE/multimodal_interfaces

Conflicts:
	SuperBall/SuperBall.sdf