Updates
Merge branch 'master' of https://github.com/PRX/PRXPlayer

Conflicts:
	PRXPlayer.m