ajout d'un menu proposant des option
Merge branch 'master' of https://github.com/EmileCadorel/Teelol

Conflicts:
	trunk/gr/main.cc