begin use tools.conf
Merge remote-tracking branch 'origin/master'

Conflicts:
	crontab.default
	pi-cron-ping-config
	pi-cron-scan
	tools.conf