tommy fixes
Merge branch 'develop' of https://github.com/masallahaydragones/veme.tv into develop