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
channels search: remove special code, let XMLConverter do the job
XMLConverter test code update...
PMSmark: change to IP:port

- this allows to differentiate multiple PMSs at one remote location
(having the same public IP, but different ports)
Simplify Flatten Season
Fix TV Secondary showview
update to latest git