Merge branch 'master' of http://github.com/charlieweb/sitiosweb
agregando las ultimas cosas del reproductor
as