test
Ajout fenetre administration defis
f
Merge branch 'master' of https://github.com/Polydefis/polydefis.git

Conflicts:
	PolyDefisV4/bin/PolyDefisV4.apk
	PolyDefisV4/bin/classes.dex
	PolyDefisV4/bin/resources.ap_
	PolyDefisV4/src/com/polydefisv4/affichageDefis/AffichageQuizzFragment.java
d
Merge branch 'master' of https://github.com/Polydefis/polydefis.git