Progression à date
Merge remote-tracking branch 'origin/master'

Conflicts:
	Inox/app/src/main/java/ca/qc/cstj/android/inox/MainActivity.java

	Inox/app/src/main/java/ca/qc/cstj/android/inox/services/ServicesURI.java