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

Conflicts:
	app/src/main/AndroidManifest.xml