deleted:    settings.php.save
	deleted:    stock.settings.php
Merge branch 'master' of github.com:courtvb/dwsbase