Configuration adjustments

Tite
Configuration adjustments

Tite
Merge origin/master

Conflicts:
	crontab/CronUtils.py