fixing embed player popup
fixing a few minor bugs which should remove errors and redirects therefore speeding things up a little
added pause button
minor style tweeks to index page
Merge branch 'refs/heads/upstream/master'

Conflicts:
	static/scripts.js
	static/style.css
	templates/blocks/player.html