terminado piropo tipo 2
Merge remote-tracking branch 'origin/daas' into daas

Conflicts:
	.idea/workspace.xml
	public/js/tvchat/tvchat.manager.js
ok