cambios marquee y filtro
Merge remote-tracking branch 'origin/daas' into daas

Conflicts:
	application/views/scripts/tvchat/admin.phtml
cambios marquee y filtro
Merge remote-tracking branch 'origin/daas' into daas

Conflicts:
	application/views/scripts/tvchat/admin.phtml
	public/js/tvchat/tvchat.child.js
	public/js/tvchat/tvchat.manager.js
version final 2.1