French touch puta madre
Merge branch 'master' of https://github.com/jmcomets/EUSDAB

Conflicts:
	lib/SFML-2.0-rc/lib/libsfml-audio.so
	lib/SFML-2.0-rc/lib/libsfml-graphics.so
	lib/SFML-2.0-rc/lib/libsfml-network.so
	lib/SFML-2.0-rc/lib/libsfml-system.so
	lib/SFML-2.0-rc/lib/libsfml-window.so
Merge branch 'master' of https://github.com/jmcomets/EUSDAB