seryrdty
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/ca/qc/cstj/android/tp2_android/CinemaHoraireFragment.java

	app/src/main/java/ca/qc/cstj/android/tp2_android/adapters/HoraireAdapter.java
	app/src/main/java/ca/qc/cstj/android/tp2_android/models/Horaire.java