interface graphique
Merge branch 'GitHub/master'

Conflicts:
	bin/PaquetCoachApp.apk
	bin/classes.dex
	bin/classes/com/example/paquetcoachapp/ParametresActivity.class
	bin/classes/com/example/paquetcoachapp/ParametresReseauActivity.class
	bin/classes/com/example/paquetcoachapp/R$layout.class
	bin/classes/com/example/paquetcoachapp/R$menu.class
	bin/classes/com/example/paquetcoachapp/R$string.class
	bin/classes/com/example/paquetcoachapp/R$style.class
	bin/classes/com/example/paquetcoachapp/R$xml.class
	bin/classes/com/example/paquetcoachapp/ReseauActivity.class
	bin/classes/com/example/paquetcoachapp/StatsActivity.class
	bin/resources.ap_