did somethign to config file
Merge remote branch 'origin/master'

Conflicts:
	config.py
	cronjobs