verificar
verificar
verificar
verificar
Merge remote-tracking branch 'origin/daas' into daas

Conflicts:
	.idea/workspace.xml
	log/tvchat_2014-08-07.log
	log/www.entermovil.com.py_2014-08-07.log
agregado ventana tvhot