Conflicts:
	interface/web/mail/templates/mail_user_backup_list.htm

Removed idn2ascii filter from mail pattern field in spamfilter_users form as the filter alters the pattern so that the wildcard pattern @. is not possible.

Master

See merge request !156

fixed small bug in mail-backup-cron

Master

See merge request !155

- removed most static content from scrigo

- cleaned up some javascript

Fixed error in Mail-Backup-Cron-Task (created file /dev/nul - missing l)

Fix for mailrestore, to avoid confusion about web- and mail-backups with same ids

additional added mail_backup to webspace-quota if mail and webdomain are on the same server
changed backup-filesize from formated string to byte-count, because of low-level-remote functions

Master

See merge request !152