After OIR
Merge branch 'master' of https://github.com/bigbn/Grooplayer

Conflicts:
	media/controls.js
	media/css/base.css
	templates/index.html