3e
Merge branch 'master' of https://github.com/luca9294/TV-SHOW-N.git

Conflicts:
	TV_SHOWS/bin/TV_SHOWS.apk
	TV_SHOWS/bin/classes.dex
	TV_SHOWS/bin/resources.ap_