logo and header
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/images/_notes/dwsync.xml