Commit
Boom

Conflicts:
	_notes/dwsync.xml
	config.xml
	js/_notes/dwsync.xml
	mobiscroll/css/_notes/dwsync.xml
	mobiscroll/js/_notes/dwsync.xml
	templates/_notes/dwsync.xml