Lots of evil in main.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml