Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/labo/ingesup/series/activities/DetailActivity.java
	app/src/main/java/com/example/labo/ingesup/series/bean/Serie.java
Merge branch 'master' of https://github.com/palepoivre/Series
Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/labo/ingesup/series/activities/DetailActivity.java
	app/src/main/java/com/example/labo/ingesup/series/bean/Serie.java
Merge branch 'master' of https://github.com/palepoivre/Series

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/labo/ingesup/series/activities/DetailActivity.java
	app/src/main/java/com/example/labo/ingesup/series/bean/Serie.java