moviendo sesion
Merge remote-tracking branch 'origin/master'

Conflicts:
	estilo.css
	image/_notes/dwsync.xml