;lkj;lkj;lkj

jjlk
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	inc/_notes/dwsync.xml
	inc/jquery/_notes/dwsync.xml
	inc/jquery/images/_notes/dwsync.xml
	inc/jquery/images/icons-png/_notes/dwsync.xml