jhgjhg
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/ca/qc/cstj/android/epreuvesynthese/models/Explorateur.java