ok
ok
ok
disconnecting all from a connectorId
Merge branch 'master' into platanos

Conflicts:
	index.html
	platanos.html
ok