Merge remote-tracking branch 'origin/master' into 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
Merge remote-tracking branch 'origin/master' into Caro

Conflicts:
	What2Watch/AndroidManifest.xml
	What2Watch/src/com/example/what2watch/List_of_request.java
Find cinema done AGAIN
Merge remote-tracking branch 'origin/master' into Caro
channel
test de commit sur bin
Merge remote-tracking branch 'origin/Caro'

Conflicts:
	What2Watch/bin/AndroidManifest.xml