Cronjob, Importer und UTF-8
Merge branch 'master' of bitbucket.org:Mainboarder/s2firewall

Conflicts:
	cron.sh