On the road !
Merge branch 'master' of https://github.com/giliam/mig2013

Conflicts:
	src/speechserver/audioConverter.py