java cest dla crote
Merge remote-tracking branch 'origin/master'

Conflicts:

	ProjectCinema/app/src/main/java/ca/qc/cstj/android/projectcinema/adapters/CinemaAdapter.java
	ProjectCinema/app/src/main/res/values/strings.xml