misc changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/default/settings.php
delete settings file