Merge remote-tracking branch 'origin/Caro'

Conflicts:
	What2Watch/src/com/example/what2watch/Channel.java
	What2Watch/src/com/example/what2watch/Cinema.java
	What2Watch/src/com/example/what2watch/Cinema_Activity.java
	What2Watch/src/com/example/what2watch/Movie.java
	What2Watch/src/com/example/what2watch/Movie_Activity.java

Reste encore 4 erreurs.
Merge remote-tracking branch 'origin/master' into Caro