Merge branch 'master' of https://github.com/iBaa/PlexConnect

Conflicts:
assets/templates/TVShow/Season_Coverflow.xml
assets/templates/TVShow/Season_Coverflow_Fanart.xml
assets/templates/TVShow/Season_List.xml
assets/templates/TVShow/Season_List_Fanart.xml