Integration de toutes les parties
Assemblage module
Merge branch 'master' of https://github.com/Polydefis/polydefis.git

Conflicts:
	PolyDefisV4/src/com/polydefisv4/bean/Defi.java
	PolyDefisV4/src/com/polydefisv4/bean/defis/Geolocalisation.java
	PolyDefisV4/src/com/polydefisv4/bean/defis/Photo.java
	PolyDefisV4/src/com/polydefisv4/bean/defis/QrCode.java
	PolyDefisV4/src/com/polydefisv4/bean/defis/Quizz.java
	PolyDefisV4/src/com/polydefisv4/testActivityMartin/ActivityTestMartin.java
	PolyDefisV4/src/com/polydefisv4/testActivityMartin/Debug.java