use proper separator if the key already has ? (then it needs to be & for the url to be valid)
fixes the playback from the unwatched view
Merge branch 'frodo' of github.com:zeflash/plugin.video.plexbmc into frodo
onDeck should also be sorted by date
Fixed shelf access for tvshows
Merge branch 'frodo' of https://github.com/zeflash/plugin.video.plexbmc into frodo

Conflicts:
	default.py

merge zeflash's changes