player
Merge branch 'develop' of https://github.com/TomDudfield/UnoTV into develop

Conflicts:
	UnoTV.Web/Domain/Player.cs