Merge tag '1.2.1' into develop

1.2.1
Merge branch 'release/1.3.0'
Merge branch 'develop' of http://github.com/masallahaydragones/veme.tv into develop
cambios para que valide w3c y tag mal cerrada
Merge branch 'hotfix/htmlvalidate'
Merge tag 'htmlvalidate' into develop

cambios para validar w3c