adding cancel to onDeck viewing
Merge branch 'master' of https://github.com/suhajdab/SiriProxy-Plex

Conflicts:
	lib/siriproxy-plex.rb