Changed Video Player Location
Merge remote-tracking branch 'origin/master'

Conflicts:
	coffee/_player.coffee
	coffee/_search.coffee