cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	image/_notes/dwsync.xml
	php/_notes/dwsync.xml
	sistema/_notes/dwsync.xml