Options pas testé
Merge branch 'master-options' of https://github.com/julienCsj/ProjetAndroid into master-leo

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameOptionsActivity.java