Merge branch 'hls' into kiberpipa

Conflicts:
	buildout.d/development.cfg

Now supports hls